package/wireguard upgrade
cover package/wireguard upgrade
With the kernel support for WireGuard getting mainlined, the upstream repo has been split in a wireguard-tools repo for the userspace tooling and wireguard-linux-compat for the kernel side (for 3.10+ legacy kernels).
This series changes the wireguard package to use the wireguard-tools repo and adds a package for wireguard-linux-compat.
Peter Korsgaard (2):
package/wireguard: change to the wireguard-tools package package/wireguard-linux-compat: new package
DEVELOPERS | 1 + package/Config.in | 1 + package/wireguard-linux-compat/Config.in | 23 +++++++++++++++++++ .../wireguard-linux-compat.hash | 4 ++++ .../wireguard-linux-compat.mk | 15 ++++++++++++ package/wireguard/Config.in | 9 ++++---- package/wireguard/wireguard.hash | 4 ++-- package/wireguard/wireguard.mk | 15 ++++-------- 8 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 package/wireguard-linux-compat/Config.in create mode 100644 package/wireguard-linux-compat/wireguard-linux-compat.hash create mode 100644 package/wireguard-linux-compat/wireguard-linux-compat.mk
Signature · 1 line
2.20.1
PATCH 1/2 package/wireguard: change to the wireguard-tools package
With the kernel support for WireGuard getting mainlined, the upstream repo has been split in a wireguard-tools repo for the userspace tooling and wireguard-linux-compat for the kernel side (for 3.10+ legacy kernels).
Keep the BR2_PACKAGE_WIREGUARD name for the userspace utilities for compatibility reasons.
--- package/wireguard/Config.in | 9 ++++----- package/wireguard/wireguard.hash | 4 ++-- package/wireguard/wireguard.mk | 15 +++++---------- 3 files changed, 11 insertions(+), 17 deletions(-)
package/wireguard/Config.in +4 -5
@@ -11,11 +11,10 @@ config BR2_PACKAGE_WIREGUARD more performant than OpenVPN. WireGuard is designed as a general purpose VPN for running on embedded interfaces and super computers alike, fit for many different - circumstances. Initially released for the Linux kernel, it - plans to be cross-platform and widely deployable. It is - currently under heavy development, but already it might be - regarded as the most secure, easiest to use, and simplest - VPN solution in the industry. + circumstances. + + This package provides the userspace tooling to configure + WireGuard tunnels. https://www.wireguard.com
package/wireguard/wireguard.hash +2 -2
@@ -1,4 +1,4 @@ -# https://lists.zx2c4.com/pipermail/wireguard/2019-December/004764.html -sha256 b0d718380f7a8822b2f12d75e462fa4eafa3a77871002981f367cd4fe2a1b071 WireGuard-0.0.20191212.tar.xz +# https://lists.zx2c4.com/pipermail/wireguard/2020-January/004819.html +sha256 547cd1c2f8dca904faac9e8d3964f1ef956c24bb12e3498da88dde95243c7f08 wireguard-tools-1.0.20200102.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/wireguard/wireguard.mk +5 -10
@@ -4,9 +4,9 @@ # ################################################################################ -WIREGUARD_VERSION = 0.0.20191212 -WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot -WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz +WIREGUARD_VERSION = 1.0.20200102 +WIREGUARD_SITE = https://git.zx2c4.com/wireguard-tools/snapshot +WIREGUARD_SOURCE = wireguard-tools-$(WIREGUARD_VERSION).tar.xz WIREGUARD_LICENSE = GPL-2.0 WIREGUARD_LICENSE_FILES = COPYING WIREGUARD_DEPENDENCIES = host-pkgconf libmnl
@@ -25,17 +25,12 @@ endif define WIREGUARD_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_MAKE_OPTS) \ - -C $(@D)/src/tools + -C $(@D)/src endef define WIREGUARD_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_MAKE_OPTS) \ - -C $(@D)/src/tools install DESTDIR=$(TARGET_DIR) + -C $(@D)/src install DESTDIR=$(TARGET_DIR) endef -ifeq ($(BR2_LINUX_KERNEL),y) -WIREGUARD_MODULE_SUBDIRS = src -$(eval $(kernel-module)) -endif - $(eval $(generic-package))
Signature · 1 line
2.20.1
PATCH 2/2 package/wireguard-linux-compat: new package
In reply to Peter KorsgaardWith the kernel support for WireGuard getting mainlined, the upstream repo has been split in a wireguard-tools repo for the userspace tooling and wireguard-linux-compat for the kernel side (for 3.10+ legacy kernels).
Add a wireguard-linux-compat for the compatibility out-of-tree kernel module.
--- DEVELOPERS | 1 + package/Config.in | 1 + package/wireguard-linux-compat/Config.in | 23 +++++++++++++++++++ .../wireguard-linux-compat.hash | 4 ++++ .../wireguard-linux-compat.mk | 15 ++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 package/wireguard-linux-compat/Config.in create mode 100644 package/wireguard-linux-compat/wireguard-linux-compat.hash create mode 100644 package/wireguard-linux-compat/wireguard-linux-compat.mk
DEVELOPERS +1 -0
@@ -1940,6 +1940,7 @@ F: package/sedutil/ F: package/tpm2-totp/ F: package/triggerhappy/ F: package/wireguard/ +F: package/wireguard-linux-compat/ F: support/testing/tests/package/test_docker_compose.py N: Peter Seiderer <[email protected]>
package/Config.in +1 -0
@@ -2173,6 +2173,7 @@ endif source "package/wget/Config.in" source "package/whois/Config.in" source "package/wireguard/Config.in" + source "package/wireguard-linux-compat/Config.in" source "package/wireless-regdb/Config.in" source "package/wireless_tools/Config.in" source "package/wireshark/Config.in"
package/wireguard-linux-compat/Config.in new file +23 -0
@@ -0,0 +1,23 @@ +config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT + bool "wireguard linux-compat" + depends on BR2_LINUX_KERNEL + # kernel module requires 3.10+ + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 + help + WireGuard is an extremely simple yet fast and modern VPN + that utilizes state-of-the-art cryptography. It aims to be + faster, simpler, leaner, and more useful than IPSec, while + avoiding the massive headache. It intends to be considerably + more performant than OpenVPN. WireGuard is designed as a + general purpose VPN for running on embedded interfaces and + super computers alike, fit for many different + circumstances. + + Support for WireGuard is included in Linux 5.6+. This + package provides a backport of the kernel support for older + kernels. + + https://www.wireguard.com + +comment "wireguard-linux-compat needs a toolchain w/ headers >= 3.10" + depends on BR2_LINUX_KERNEL && !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
package/wireguard-linux-compat/wireguard-linux-compat.hash new file +4 -0
@@ -0,0 +1,4 @@ +# https://lists.zx2c4.com/pipermail/wireguard/2020-January/004844.html +sha256 9f12f68e96f6865325995c38213e09b05751cd1ef03e0bbc9f1bdc3e5680b337 wireguard-linux-compat-0.0.20200105.tar.xz +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/wireguard-linux-compat/wireguard-linux-compat.mk new file +15 -0
@@ -0,0 +1,15 @@ +################################################################################ +# +# wireguard +# +################################################################################ + +WIREGUARD_LINUX_COMPAT_VERSION = 0.0.20200105 +WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot +WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz +WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0 +WIREGUARD_LINUX_COMPAT_LICENSE_FILES = COPYING +WIREGUARD_LINUX_COMPAT_MODULE_SUBDIRS = src + +$(eval $(kernel-module)) +$(eval $(generic-package))
Signature · 1 line
2.20.1
cover package/wireguard upgrade
In reply to Peter KorsgaardPeter, All,
On 2020-01-06 11:47 +0100, Peter Korsgaard spake thusly:
Quoted 6 lines
With the kernel support for WireGuard getting mainlined, the upstream repo has been split in a wireguard-tools repo for the userspace tooling and wireguard-linux-compat for the kernel side (for 3.10+ legacy kernels).
This series changes the wireguard package to use the wireguard-tools repo and adds a package for wireguard-linux-compat.
So, previously, selecting BR2_PACKAGE_WIREGUARD would build both the kernel module and the userland tools, as they were packagesd in a single upstream package.
Now, they are separated into two different upstream packages, namely wireguard-tools and wireguard-linux-compat.
With your patchset, an existing defconfig will now only build the userland tools, even if the user would still need the kernel module for older kernels.
So, my proposal would be to have a single patch that introduces the split, with a renaming of the existing wireguard package, and a legacy symbol that selects both the userland tools and the compat module.
This would allow existing configs to stay to iso-functionality. Thanks to the legacy handling, the user will notice and will have to confirm they still need/want the kernel module, and they can disable it if not.
Thoughts?
Regards,
Yann E. MORIN.
Quoted 24 lines
Peter Korsgaard (2):
package/wireguard: change to the wireguard-tools package package/wireguard-linux-compat: new packageDEVELOPERS | 1 + package/Config.in | 1 + package/wireguard-linux-compat/Config.in | 23 +++++++++++++++++++ .../wireguard-linux-compat.hash | 4 ++++ .../wireguard-linux-compat.mk | 15 ++++++++++++ package/wireguard/Config.in | 9 ++++---- package/wireguard/wireguard.hash | 4 ++-- package/wireguard/wireguard.mk | 15 ++++-------- 8 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 package/wireguard-linux-compat/Config.in create mode 100644 package/wireguard-linux-compat/wireguard-linux-compat.hash create mode 100644 package/wireguard-linux-compat/wireguard-linux-compat.mkSignature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
cover package/wireguard upgrade
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Peter, All,
On 2020-01-06 11:47 +0100, Peter Korsgaard spake thusly:Quoted 4 lines
With the kernel support for WireGuard getting mainlined, the upstream repo has been split in a wireguard-tools repo for the userspace tooling and wireguard-linux-compat for the kernel side (for 3.10+ legacy kernels).
Quoted 6 lines
Quoted 2 lines
This series changes the wireguard package to use the wireguard-tools repo and adds a package for wireguard-linux-compat.
So, previously, selecting
BR2_PACKAGE_WIREGUARDwould build both the kernel module and the userland tools, as they were packagesd in a single upstream package.
Yes, if the configuration builds a Linux kernel.
Quoted 10 lines
Now, they are separated into two different upstream packages, namely wireguard-tools and wireguard-linux-compat.
With your patchset, an existing defconfig will now only build the userland tools, even if the user would still need the kernel module for older kernels.
So, my proposal would be to have a single patch that introduces the split, with a renaming of the existing wireguard package, and a legacy symbol that selects both the userland tools and the compat module.
I don't think there is any specific reason why it all HAS to be done in a single commit?
Quoted 3 lines
This would allow existing configs to stay to iso-functionality. Thanks to the legacy handling, the user will notice and will have to confirm they still need/want the kernel module, and they can disable it if not.
The symbol rename is a bit more noisy, but it indeed is nicer for users of the legacy kernel module.
Thanks, I've sent a v2 implementing that.
Signature · 1 line
Bye, Peter Korsgaard