From 17a7f58e17c2eb5c35458bfd87135b533a3cb15f Mon Sep 17 00:00:00 2001 From: chewitt Date: Mon, 13 Apr 2020 03:29:49 +0000 Subject: [PATCH 1/5] wireguard: update wireguard-linux-compat to v1.0.20200401 and drop version check patch --- packages/network/wireguard-linux-compat/package.mk | 4 ++-- ...nux-compat-01-skip-compat_h-version-checks.patch | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 packages/network/wireguard-linux-compat/patches/wireguard-linux-compat-01-skip-compat_h-version-checks.patch diff --git a/packages/network/wireguard-linux-compat/package.mk b/packages/network/wireguard-linux-compat/package.mk index f4b1e968bf..578c0eb0a7 100644 --- a/packages/network/wireguard-linux-compat/package.mk +++ b/packages/network/wireguard-linux-compat/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wireguard-linux-compat" -PKG_VERSION="v1.0.20200330" -PKG_SHA256="eb39820e1898b268653178fc05a101e6ace25b00a6cc89f9cb03ef77cb1cc23e" +PKG_VERSION="v1.0.20200401" +PKG_SHA256="e80e6c6386217585640974106cf6f9a0a8a8fb91a4f75e943c0a39a204a3045f" PKG_LICENSE="GPLv2" PKG_SITE="https://www.wireguard.com" PKG_URL="https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$PKG_VERSION.tar.xz" diff --git a/packages/network/wireguard-linux-compat/patches/wireguard-linux-compat-01-skip-compat_h-version-checks.patch b/packages/network/wireguard-linux-compat/patches/wireguard-linux-compat-01-skip-compat_h-version-checks.patch deleted file mode 100644 index e4f26ce4d4..0000000000 --- a/packages/network/wireguard-linux-compat/patches/wireguard-linux-compat-01-skip-compat_h-version-checks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/compat/compat.h b/src/compat/compat.h -index 1aa0e7b..751ace7 100644 ---- a/src/compat/compat.h -+++ b/src/compat/compat.h -@@ -43,7 +43,7 @@ - #error "WireGuard requires Linux >= 3.10" - #endif - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0) - #error "WireGuard has been merged into Linux >= 5.6 and therefore this compatibility module is no longer required." - #endif - From 790d36914ec6dc09608e826a63fc2a49a62e38af Mon Sep 17 00:00:00 2001 From: chewitt Date: Mon, 13 Apr 2020 03:51:50 +0000 Subject: [PATCH 2/5] wireguard: make wireguard-linux-compat PROJECT conditional --- packages/virtual/network/package.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk index 554d0c20dc..cc0eaf6a78 100644 --- a/packages/virtual/network/package.mk +++ b/packages/virtual/network/package.mk @@ -23,7 +23,15 @@ if [ "$OPENVPN_SUPPORT" = "yes" ]; then fi if [ "$WIREGUARD_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wireguard-tools wireguard-linux-compat" + # projects using Linux 5.6+ can use the in-kernel module + case $PROJECT in + Allwinner|Amlogic|Generic|NXP|Qualcomm) + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wireguard-tools" + ;; + *) + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wireguard-tools wireguard-linux-compat" + ;; + esac fi # nss needed by inputstream.adaptive, chromium etc. From 81ca6b93ded65b7f3fde4a2ddc4878c3bfaa6b64 Mon Sep 17 00:00:00 2001 From: chewitt Date: Mon, 13 Apr 2020 03:31:26 +0000 Subject: [PATCH 3/5] wireguard: update wireguard-tools to v1.0.20200319 and drop libmnl dependency --- packages/network/wireguard-tools/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/network/wireguard-tools/package.mk b/packages/network/wireguard-tools/package.mk index d3f5870a28..e22023aa68 100644 --- a/packages/network/wireguard-tools/package.mk +++ b/packages/network/wireguard-tools/package.mk @@ -2,12 +2,12 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wireguard-tools" -PKG_VERSION="v1.0.20200206" -PKG_SHA256="2528b9f99dbbb7a9498b9e1657996c865a04fa2f7c5fb6fe484f3725b7723d9c" +PKG_VERSION="v1.0.20200319" +PKG_SHA256="bba0d33f29412ad80dfd4426b088a6485bb0991f8071c45439895b7140271336" PKG_LICENSE="GPLv2" PKG_SITE="https://www.wireguard.com" PKG_URL="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain linux libmnl" +PKG_DEPENDS_TARGET="toolchain linux" PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="WireGuard VPN userspace tools" PKG_TOOLCHAIN="manual" From 3ae5345dca63615931a2a0573096187003def445 Mon Sep 17 00:00:00 2001 From: chewitt Date: Mon, 13 Apr 2020 03:40:58 +0000 Subject: [PATCH 4/5] wireguard: disable linux kernel module if not enabled in options --- packages/linux/package.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 504bf30d16..ba14f5cec6 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -110,6 +110,11 @@ post_patch() { sed -e "s|^CONFIG_DRM_LIMA=.*$|# CONFIG_DRM_LIMA is not set|" -i $PKG_BUILD/.config sed -e "s|^CONFIG_DRM_PANFROST=.*$|# CONFIG_DRM_PANFROST is not set|" -i $PKG_BUILD/.config fi + + # disable wireguard support if not enabled + if [ ! "$WIREGUARD_SUPPORT" = yes ]; then + sed -e "s|^CONFIG_WIREGUARD=.*$|# CONFIG_WIREGUARD is not set|" -i $PKG_BUILD/.config + fi fi } From 246a0b2da9af23004af0dbc72f4ffe3e5c64163c Mon Sep 17 00:00:00 2001 From: chewitt Date: Mon, 13 Apr 2020 04:18:42 +0000 Subject: [PATCH 5/5] linux: fix wireguard build on Dragonboard image --- .../Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf b/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf index bb137a1bca..510aaadbdc 100644 --- a/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf +++ b/projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf @@ -830,7 +830,8 @@ CONFIG_IP_MROUTE_COMMON=y # CONFIG_IP_MROUTE is not set CONFIG_SYN_COOKIES=y # CONFIG_NET_IPVTI is not set -# CONFIG_NET_FOU is not set +CONFIG_NET_UDP_TUNNEL=y +CONFIG_NET_FOU=m # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set @@ -1955,6 +1956,8 @@ CONFIG_MII=y CONFIG_NET_CORE=y # CONFIG_BONDING is not set # CONFIG_DUMMY is not set +CONFIG_WIREGUARD=y +# CONFIG_WIREGUARD_DEBUG is not set # CONFIG_EQUALIZER is not set # CONFIG_NET_FC is not set # CONFIG_NET_TEAM is not set