jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4321 from chewitt/wireguard-bump

Browse Source 
WireGuard package cleanup and updates
This commit is contained in:
MilhouseVH 2020-04-17 03:31:26 +01:00 committed by GitHub
commit 2c8900c2b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/linux/package.mk
View File

@ -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
}

4
packages/network/wireguard-linux-compat/package.mk
View File

@ -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"

13
packages/network/wireguard-linux-compat/patches/wireguard-linux-compat-01-skip-compat_h-version-checks.patch
View File

@ -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

6
packages/network/wireguard-tools/package.mk
View File

@ -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"

10
packages/virtual/network/package.mk
View File

@ -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.

5
projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf
View File

@ -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