Skip to contentSkip to conversation

package/wireguard upgrade

PATCH New Peter Korsgaard 2 participants 4 messages Jan 9, 2020

lore
Share & tools
lore
#0 lore raw

v2 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 renames the wireguard package to wireguard-tools for the userspace tooling and adds a package for wireguard-linux-compat.

Changes since v1:
- Rename the userspace package to wireguard-tools and add Config.in.legacy handling as suggested by Yann

Peter Korsgaard (2):
package/wireguard: change to the wireguard-tools package package/wireguard-linux-compat: new package

 Config.in.legacy                              | 11 +++++
 DEVELOPERS                                    |  3 +-
 package/Config.in                             |  3 +-
 package/wireguard-linux-compat/Config.in      | 23 +++++++++++
 .../wireguard-linux-compat.hash               |  4 ++
 .../wireguard-linux-compat.mk                 | 15 +++++++
 .../{wireguard => wireguard-tools}/Config.in  | 15 ++++---
 package/wireguard-tools/wireguard-tools.hash  |  4 ++
 package/wireguard-tools/wireguard-tools.mk    | 36 ++++++++++++++++
 package/wireguard/wireguard.hash              |  4 --
 package/wireguard/wireguard.mk                | 41 -------------------
 11 files changed, 104 insertions(+), 55 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
 rename package/{wireguard => wireguard-tools}/Config.in (63%)
 create mode 100644 package/wireguard-tools/wireguard-tools.hash
 create mode 100644 package/wireguard-tools/wireguard-tools.mk
 delete mode 100644 package/wireguard/wireguard.hash
 delete mode 100644 package/wireguard/wireguard.mk
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 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).

So rename the package to wireguard-tools, use the new upstream and drop the kernel module handling.

Also add Config.in.legacy handling for existing users.

---
Changes since v1:
- Rename package to wireguard-tools
- Add Config.in.legacy handling

Config.in.legacy | 9 ++++

 DEVELOPERS                                    |  2 +-
 package/Config.in                             |  2 +-
 .../{wireguard => wireguard-tools}/Config.in  | 15 ++++---
 package/wireguard-tools/wireguard-tools.hash  |  4 ++
 package/wireguard-tools/wireguard-tools.mk    | 36 ++++++++++++++++
 package/wireguard/wireguard.hash              |  4 --
 package/wireguard/wireguard.mk                | 41 -------------------
 8 files changed, 58 insertions(+), 55 deletions(-)
 rename package/{wireguard => wireguard-tools}/Config.in (63%)
 create mode 100644 package/wireguard-tools/wireguard-tools.hash
 create mode 100644 package/wireguard-tools/wireguard-tools.mk
 delete mode 100644 package/wireguard/wireguard.hash
 delete mode 100644 package/wireguard/wireguard.mk
Config.in.legacy +9 -0
index c483ac3856..b9bb1aa57d 100644
@@ -146,6 +146,15 @@ endif
 
 comment "Legacy options removed in 2020.02"
 
+config BR2_PACKAGE_WIREGUARD
+	bool "wireguard package renamed"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+	select BR2_LEGACY
+	select BR2_PACKAGE_WIREGUARD_TOOLS
+	help
+	  The wireguard package has been renamed to wireguard-tools to
+	  match upstream.
+
 config BR2_PACKAGE_PERL_NET_PING
 	bool "perl-net-ping was removed"
 	select BR2_LEGACY
DEVELOPERS +1 -1
index 1f86c256a5..66dc7cf4c2 100644
@@ -1945,7 +1945,7 @@ F:	package/python-websocket-client/
 F:	package/sedutil/
 F:	package/tpm2-totp/
 F:	package/triggerhappy/
-F:	package/wireguard/
+F:	package/wireguard-tools/
 F:	support/testing/tests/package/test_docker_compose.py
 
 N:	Peter Seiderer <[email protected]>
package/Config.in +1 -1
index 45935ce18e..170a1c986d 100644
@@ -2176,7 +2176,7 @@ endif
 	source "package/wavemon/Config.in"
 	source "package/wget/Config.in"
 	source "package/whois/Config.in"
-	source "package/wireguard/Config.in"
+	source "package/wireguard-tools/Config.in"
 	source "package/wireless-regdb/Config.in"
 	source "package/wireless_tools/Config.in"
 	source "package/wireshark/Config.in"
package/wireguard-tools/Config.in renamed from package/wireguard/Config.in +7 -8
similarity index 63%
rename from package/wireguard/Config.in
rename to package/wireguard-tools/Config.in
index fe92fd6cfc..bae8a9dc6e 100644
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_WIREGUARD
-	bool "wireguard"
+config BR2_PACKAGE_WIREGUARD_TOOLS
+	bool "wireguard tools"
 	# kernel module requires 3.10+, userspace makes no sense without it
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
 	select BR2_PACKAGE_LIBMNL
@@ -11,13 +11,12 @@ 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
 
-comment "wireguard needs a toolchain w/ headers >= 3.10"
+comment "wireguard-tools needs a toolchain w/ headers >= 3.10"
 	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
package/wireguard-tools/wireguard-tools.hash new file +4 -0
new file mode 100644
index 0000000000..b8b1dac1ac
@@ -0,0 +1,4 @@
+# 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-tools/wireguard-tools.mk new file +36 -0
new file mode 100644
index 0000000000..6fcfebf13a
@@ -0,0 +1,36 @@
+################################################################################
+#
+# wireguard-tools
+#
+################################################################################
+
+WIREGUARD_TOOLS_VERSION = 1.0.20200102
+WIREGUARD_TOOLS_SITE = https://git.zx2c4.com/wireguard-tools/snapshot
+WIREGUARD_TOOLS_SOURCE = wireguard-tools-$(WIREGUARD_TOOLS_VERSION).tar.xz
+WIREGUARD_TOOLS_LICENSE = GPL-2.0
+WIREGUARD_TOOLS_LICENSE_FILES = COPYING
+WIREGUARD_TOOLS_DEPENDENCIES = host-pkgconf libmnl
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+WIREGUARD_TOOLS_MAKE_OPTS += WITH_SYSTEMDUNITS=yes
+else
+WIREGUARD_TOOLS_MAKE_OPTS += WITH_SYSTEMDUNITS=no
+endif
+
+ifeq ($(BR2_PACKAGE_BASH),y)
+WIREGUARD_TOOLS_MAKE_OPTS += WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes
+else
+WIREGUARD_TOOLS_MAKE_OPTS += WITH_BASHCOMPLETION=no WITH_WGQUICK=no
+endif
+
+define WIREGUARD_TOOLS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_TOOLS_MAKE_OPTS) \
+		-C $(@D)/src
+endef
+
+define WIREGUARD_TOOLS_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_TOOLS_MAKE_OPTS) \
+		-C $(@D)/src install DESTDIR=$(TARGET_DIR)
+endef
+
+$(eval $(generic-package))
package/wireguard/wireguard.hash deleted +0 -4
deleted file mode 100644
index 66ebf41dc6..0000000000
@@ -1,4 +0,0 @@
-# https://lists.zx2c4.com/pipermail/wireguard/2019-December/004764.html
-sha256 b0d718380f7a8822b2f12d75e462fa4eafa3a77871002981f367cd4fe2a1b071  WireGuard-0.0.20191212.tar.xz
-# Locally calculated
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/wireguard/wireguard.mk deleted +0 -41

41 lines not on this page · raw message

Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 2/2 package/wireguard-linux-compat: new package

In reply to Peter Korsgaard

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

Add a wireguard-linux-compat for the compatibility out-of-tree kernel module, and update the Config.in.legacy handling to use it.

---
Changes since v1:
- Add Config.in.legacy handling

 Config.in.legacy                              |  6 +++--
 DEVELOPERS                                    |  1 +
 package/Config.in                             |  1 +
 package/wireguard-linux-compat/Config.in      | 23 +++++++++++++++++++
 .../wireguard-linux-compat.hash               |  4 ++++
 .../wireguard-linux-compat.mk                 | 15 ++++++++++++
 6 files changed, 48 insertions(+), 2 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
Config.in.legacy +4 -2
index b9bb1aa57d..1801ec06da 100644
@@ -150,10 +150,12 @@ config BR2_PACKAGE_WIREGUARD
 	bool "wireguard package renamed"
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
 	select BR2_LEGACY
+	select BR2_PACKAGE_WIREGUARD_LINUX_COMPAT if BR2_LINUX_KERNEL
 	select BR2_PACKAGE_WIREGUARD_TOOLS
 	help
-	  The wireguard package has been renamed to wireguard-tools to
-	  match upstream.
+	  The wireguard package has been renamed to wireguard-tools
+	  for the userspace tooling and wireguard-linux-compat for the
+	  kernel side for legacy (<5.6) kernels to match upstream.
 
 config BR2_PACKAGE_PERL_NET_PING
 	bool "perl-net-ping was removed"
DEVELOPERS +1 -0
index 66dc7cf4c2..80843dd1a1 100644
@@ -1945,6 +1945,7 @@ F:	package/python-websocket-client/
 F:	package/sedutil/
 F:	package/tpm2-totp/
 F:	package/triggerhappy/
+F:	package/wireguard-linux-compat/
 F:	package/wireguard-tools/
 F:	support/testing/tests/package/test_docker_compose.py
 
package/Config.in +1 -0
index 170a1c986d..873a592d64 100644
@@ -2176,6 +2176,7 @@ endif
 	source "package/wavemon/Config.in"
 	source "package/wget/Config.in"
 	source "package/whois/Config.in"
+	source "package/wireguard-linux-compat/Config.in"
 	source "package/wireguard-tools/Config.in"
 	source "package/wireless-regdb/Config.in"
 	source "package/wireless_tools/Config.in"
package/wireguard-linux-compat/Config.in new file +23 -0
new file mode 100644
index 0000000000..4ee214be63
@@ -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
new file mode 100644
index 0000000000..1653eaa089
@@ -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
new file mode 100644
index 0000000000..ddceed5660
@@ -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
#3 lore raw

v2 cover package/wireguard upgrade

In reply to Peter Korsgaard

Peter, All,

On 2020-01-09 10:16 +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 renames the wireguard package to wireguard-tools for the userspace tooling and adds a package for wireguard-linux-compat.

Both applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 36 lines

Changes since v1:
- Rename the userspace package to wireguard-tools and add Config.in.legacy handling as suggested by Yann

Peter Korsgaard (2):
package/wireguard: change to the wireguard-tools package package/wireguard-linux-compat: new package

 Config.in.legacy                              | 11 +++++
 DEVELOPERS                                    |  3 +-
 package/Config.in                             |  3 +-
 package/wireguard-linux-compat/Config.in      | 23 +++++++++++
 .../wireguard-linux-compat.hash               |  4 ++
 .../wireguard-linux-compat.mk                 | 15 +++++++
 .../{wireguard => wireguard-tools}/Config.in  | 15 ++++---
 package/wireguard-tools/wireguard-tools.hash  |  4 ++
 package/wireguard-tools/wireguard-tools.mk    | 36 ++++++++++++++++
 package/wireguard/wireguard.hash              |  4 --
 package/wireguard/wireguard.mk                | 41 -------------------
 11 files changed, 104 insertions(+), 55 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
 rename package/{wireguard => wireguard-tools}/Config.in (63%)
 create mode 100644 package/wireguard-tools/wireguard-tools.hash
 create mode 100644 package/wireguard-tools/wireguard-tools.mk
 delete mode 100644 package/wireguard/wireguard.hash
 delete mode 100644 package/wireguard/wireguard.mk
Signature · 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.  |
'------------------------------^-------^------------------^--------------------'