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 <simon.kuenzer@neclab.eu>
Reviewed-by: Sergiu Moga <sergiu.moga@protonmail.com>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Pull-Request: #9

diff --git a/Config.uk b/Config.uk
index af7bd2e35b1ddb227d945b2d39c9b768c7d87a30..fbafd8ace57bfb8575edd813fe8f4937fc675fda 100644 (file)
--- 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 43df7d633435810b81d7ffa033a11cd7a835c0dc..11283e018afe35561c6db0fe177e408276ce2160 100644 (file)
--- 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