Skip to contentSkip to conversation

package/wireguard-linux-compat: depend on headers < 5.6

PATCH New James Hilliard 2 participants 2 messages Apr 10, 2020 – Apr 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/wireguard-linux-compat: depend on headers < 5.6

Since wireguard is built into kernels 5.6 and later we can't build wireguard-linux-compat on them, so we need to depend on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6.

---
 package/wireguard-linux-compat/Config.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/wireguard-linux-compat/Config.in +7 -1
index 4ee214be63..5ecb4ef591 100644
@@ -3,6 +3,8 @@ config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT
 	depends on BR2_LINUX_KERNEL
 	# kernel module requires 3.10+
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+	# kernel module incompatible with 5.6+
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6
 	help
 	  WireGuard is an extremely simple yet fast and modern VPN
 	  that utilizes state-of-the-art cryptography. It aims to be
@@ -20,4 +22,8 @@ config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT
 	  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
+	depends on BR2_LINUX_KERNEL && !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 \
+		&& !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6
+
+comment "wireguard-linux-compat cannot be used with kernels that have native wireguard support"
+	depends on BR2_LINUX_KERNEL && BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/wireguard-linux-compat: depend on headers < 5.6

Quoted 5 lines · On Fri, 10 Apr 2020 15:34:14 -0600 James Hilliard <[email protected]>…

Since wireguard is built into kernels 5.6 and later we can't build wireguard-linux-compat on them, so we need to depend on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6.

I've applied to master.

package/wireguard-linux-compat/Config.in config BR2_PACKAGE_WIREGUARD_LINUX_COMPAT · line 29

Quoted 2 lines
package/wireguard-linux-compat/Config.in +2 -0
+comment "wireguard-linux-compat cannot be used with kernels that have native wireguard support"
+	depends on BR2_LINUX_KERNEL && BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_6

I believe this comment was not really useful. Indeed, if you have Linux greater or equal than 5.6, you can use the built-in wireguard support, there's no need for an exernal module. So I dropped this comment.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com