From d83e056bb2a16ba9e1f451e194b669d576dbb52e Mon Sep 17 00:00:00 2001 From: Simon Kuenzer Date: Tue, 19 Oct 2021 15:45:03 +0200 Subject: [PATCH] Option for latest lwIP 2.1.x version including Unikraft patches Introduces an option to choose the latest lwIP version from the 2.1.x series that is tested by the Unikraft team. This version is based on the latest official lwIP release, includes some bugfixes and security fixes, and includes feature enhancements done by the Unikraft community. These enhancements are not yet upstream available as part of the official lwIP project (upstreaming ongoing). Signed-off-by: Simon Kuenzer Reviewed-by: Sergiu Moga Tested-by: Unikraft CI GitHub-Pull-Request: #9 --- Config.uk | 12 +++++++++++- Makefile.uk | 6 +++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Config.uk b/Config.uk index af7bd2e..fbafd8a 100644 --- a/Config.uk +++ b/Config.uk @@ -9,7 +9,7 @@ menuconfig LIBLWIP if LIBLWIP choice prompt "Version" - default LWIP_RELEASE212 + default LWIP_UNIKRAFT21X help Select the version of the upstream lwIP stack sources that will be downloaded. @@ -32,6 +32,16 @@ config LWIP_LATEST21X code could become incompatible. In such a case, we recommend to select a released and officially supported version instead. + +config LWIP_UNIKRAFT21X + bool "Unikraft 2.1.x (official)" + help + Unikraft official latest available and tested lwIP + version. This version is based on the latest lwIP + release from the 2.1 release series, includes some + recent bugfixes and security patches, and includes + latest features developed by the Unikraft community + that are currently upstreamed to lwIP. endchoice menu "Netif drivers" diff --git a/Makefile.uk b/Makefile.uk index 43df7d6..11283e0 100644 --- a/Makefile.uk +++ b/Makefile.uk @@ -41,7 +41,11 @@ $(eval $(call addlib_s,liblwip,$(CONFIG_LIBLWIP))) ################################################################################ # Sources ################################################################################ -ifeq ($(CONFIG_LWIP_LATEST21X),y) +ifeq ($(CONFIG_LWIP_UNIKRAFT21X),y) +LIBLWIP_BRANCH=UNIKRAFT-2_1_x +LIBLWIP_ZIPNAME=fork-lwip-$(LIBLWIP_BRANCH) +LIBLWIP_URL=https://github.com/unikraft/fork-lwip/archive/refs/heads/$(LIBLWIP_BRANCH).zip +else ifeq ($(CONFIG_LWIP_LATEST21X),y) LIBLWIP_BRANCH=STABLE-2_1_x LIBLWIP_ZIPNAME=fork-lwip-$(LIBLWIP_BRANCH) LIBLWIP_URL=https://github.com/unikraft/fork-lwip/archive/refs/heads/$(LIBLWIP_BRANCH).zip -- 2.39.5