From: Simon Kuenzer <simon.kuenzer@neclab.eu>
Date: Fri, 15 Oct 2021 16:35:43 +0000 (+0200)
Subject: Option to choose latest lwIP version from 2.1.x series
X-Git-Tag: RELEASE-0.6~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4cb3bdf1426e4cf2597a8458eda5c3f409ae7329;p=unikraft%2Flibs%2Flwip.git

Option to choose latest lwIP version from 2.1.x series

Introduces an option to choose latest lwIP version from
the 2.1.x series. This version is based on the latest
official lwIP release and includes further bugfixes and
security fixes. Because we point to a branch head,
recent commits could break compiling. Because of this,
we mark this option as `unofficial`.

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 7630245..af7bd2e 100644
--- a/Config.uk
+++ b/Config.uk
@@ -7,6 +7,33 @@ menuconfig LIBLWIP
 	select HAVE_NW_STACK
 
 if LIBLWIP
+choice
+	prompt "Version"
+	default LWIP_RELEASE212
+	help
+		Select the version of the upstream lwIP stack
+		sources that will be downloaded.
+		Please note that you should run `make properclean`
+		whenever you change the version.
+
+config LWIP_RELEASE212
+	bool "Release 2.1.2"
+	help
+		An official release from the lwIP community.
+
+config LWIP_LATEST21X
+	bool "Latest 2.1.x (unofficial)"
+	help
+		The latest available lwIP version from the 2.1
+		release series that include recent bugfixes and
+		security patches.
+		Please note that there is a little chance that
+		depending on the changes upstream, the Unikraft
+		code could become incompatible. In such a case,
+		we recommend to select a released and officially
+		supported version instead.
+endchoice
+
 menu "Netif drivers"
 config LWIP_UKNETDEV
 	bool "Unikraft Netdev Ethernet (libuknetdev)"
diff --git a/Makefile.uk b/Makefile.uk
index 54a4ed7..43df7d6 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -41,10 +41,16 @@ $(eval $(call addlib_s,liblwip,$(CONFIG_LIBLWIP)))
 ################################################################################
 # Sources
 ################################################################################
+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
+else
 LIBLWIP_TAG=STABLE-2_1_2_RELEASE
 LIBLWIP_ZIPNAME=fork-lwip-$(LIBLWIP_TAG)
 LIBLWIP_URL=https://github.com/unikraft/fork-lwip/archive/refs/tags/$(LIBLWIP_TAG).zip
 LIBLWIP_ORIGIN_SHA256=8f0ae46e2702720ce852b00de5d304adb2809b0203741f299876594bb8be7890
+endif
 
 LIBLWIP_PATCHDIR=$(LIBLWIP_BASE)/patches
 $(eval $(call fetch,liblwip,$(LIBLWIP_URL)))