Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WireGuard package cleanup and updates #4321

Merged
merged 5 commits into from Apr 17, 2020
Merged

WireGuard package cleanup and updates #4321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
17a7f58
wireguard: update wireguard-linux-compat to v1.0.20200401 and drop ve…
chewitt Apr 13, 2020
790d369
wireguard: make wireguard-linux-compat PROJECT conditional
chewitt Apr 13, 2020
81ca6b9
wireguard: update wireguard-tools to v1.0.20200319 and drop libmnl de…
chewitt Apr 13, 2020
3ae5345
wireguard: disable linux kernel module if not enabled in options
chewitt Apr 13, 2020
246a0b2
linux: fix wireguard build on Dragonboard image
chewitt Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/linux/package.mk
View file
Open in desktop
Expand Up @@ -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
chewitt marked this conversation as resolved.
Show resolved Hide resolved
sed -e "s|^CONFIG_WIREGUARD=.*$|# CONFIG_WIREGUARD is not set|" -i $PKG_BUILD/.config
fi
fi
}

Expand Down
4 changes: 2 additions & 2 deletions packages/network/wireguard-linux-compat/package.mk
View file
Open in desktop
Expand Up @@ -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"
Expand Down
13 changes: 0 additions & 13 deletions ...reguard-linux-compat/patches/wireguard-linux-compat-01-skip-compat_h-version-checks.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions packages/network/wireguard-tools/package.mk
View file
Open in desktop
Expand Up @@ -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"
Expand Down
10 changes: 9 additions & 1 deletion packages/virtual/network/package.mk
View file
Open in desktop
Expand Up @@ -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"
chewitt marked this conversation as resolved.
Show resolved Hide resolved
;;
*)
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wireguard-tools wireguard-linux-compat"
;;
esac
fi

# nss needed by inputstream.adaptive, chromium etc.
Expand Down
5 changes: 4 additions & 1 deletion projects/Qualcomm/devices/Dragonboard/linux/linux.aarch64.conf
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down