mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
[dunfell] wireguard: Upgrade to 1.0.20220627 (module) and 1.0.20210914 (tools)
Quoting Jason A. Donenfeld on IRC: <zx2c4> Colin_Finck: you should never, ever use old versions <zx2c4> Notice that neither the major nor minor version numbers change <zx2c4> Use the latest versions on your LTS With that definite answer, I'd like to fix the problem described in https://lore.kernel.org/yocto/CswA.1659543156268567471.pbrp@lists.yoctoproject.org/ by importing the latest versions instead of maintaining our own fork of wireguard 1.0.20200401. Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Colin Finck
Armin Kuster
parent
44d843ecad
commit
7203130ed8
|
|
@ -1,29 +0,0 @@
|
|||
From ce8faa3ee266ea69431805e6ed4bd7102d982508 Mon Sep 17 00:00:00 2001
|
||||
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
||||
Date: Thu, 12 Nov 2020 09:43:38 +0100
|
||||
Subject: [PATCH] compat: SYM_FUNC_{START,END} were backported to 5.4
|
||||
|
||||
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||
|
||||
Upstream-Status: Backport
|
||||
Fixes build failure in Dunfell.
|
||||
|
||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||
|
||||
---
|
||||
compat/compat-asm.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: src/compat/compat-asm.h
|
||||
===================================================================
|
||||
--- src.orig/compat/compat-asm.h
|
||||
+++ src/compat/compat-asm.h
|
||||
@@ -40,7 +40,7 @@
|
||||
#undef pull
|
||||
#endif
|
||||
|
||||
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76)
|
||||
#define SYM_FUNC_START ENTRY
|
||||
#define SYM_FUNC_END ENDPROC
|
||||
#endif
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From 122f06bfd8fc7b06a0899fa9adc4ce8e06900d98 Mon Sep 17 00:00:00 2001
|
||||
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
||||
Date: Sun, 7 Mar 2021 08:14:33 -0700
|
||||
Subject: [PATCH] compat: icmp_ndo_send functions were backported extensively
|
||||
|
||||
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Fixes build with 5.4.103 update.
|
||||
/include/linux/icmpv6.h:56:6: note: previous declaration of 'icmpv6_ndo_send' was here
|
||||
| 56 | void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info);
|
||||
|
||||
Signed-of-by: Armin Kuster <akuster808@gmail.com>
|
||||
|
||||
---
|
||||
src/compat/compat.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: src/compat/compat.h
|
||||
===================================================================
|
||||
--- src.orig/compat/compat.h
|
||||
+++ src/compat/compat.h
|
||||
@@ -946,7 +946,7 @@ static inline int skb_ensure_writable(st
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
|
||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 102) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 178) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 223) && LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 259) || defined(ISRHEL8) || defined(ISUBUNTU1804)
|
||||
#if IS_ENABLED(CONFIG_NF_NAT)
|
||||
#include <linux/ip.h>
|
||||
#include <linux/icmpv6.h>
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
require wireguard.inc
|
||||
|
||||
SRCREV = "43f57dac7b8305024f83addc533c9eede6509129"
|
||||
|
||||
SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat;branch=master \
|
||||
file://0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch \
|
||||
file://0001-compat-icmp_ndo_send-functions-were-backported-exten.patch "
|
||||
|
||||
inherit module kernel-module-split
|
||||
|
||||
DEPENDS = "virtual/kernel libmnl"
|
||||
|
||||
# This module requires Linux 3.10 higher and several networking related
|
||||
# configuration options. For exact kernel requirements visit:
|
||||
# https://www.wireguard.io/install/#kernel-requirements
|
||||
|
||||
EXTRA_OEMAKE_append = " \
|
||||
KERNELDIR=${STAGING_KERNEL_DIR} \
|
||||
"
|
||||
|
||||
MAKE_TARGETS = "module"
|
||||
|
||||
RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit"
|
||||
MODULE_NAME = "wireguard"
|
||||
|
||||
module_do_install() {
|
||||
install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}
|
||||
install -m 0644 ${MODULE_NAME}.ko \
|
||||
${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
require wireguard.inc
|
||||
|
||||
SRCREV = "18fbcd68a35a892527345dc5679d0b2d860ee004"
|
||||
|
||||
SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat;protocol=https;branch=master"
|
||||
|
||||
inherit module kernel-module-split
|
||||
|
||||
DEPENDS = "virtual/kernel libmnl"
|
||||
|
||||
# This module requires Linux 3.10 higher and several networking related
|
||||
# configuration options. For exact kernel requirements visit:
|
||||
# https://www.wireguard.io/install/#kernel-requirements
|
||||
|
||||
EXTRA_OEMAKE_append = " \
|
||||
KERNELDIR=${STAGING_KERNEL_DIR} \
|
||||
"
|
||||
|
||||
MAKE_TARGETS = "module"
|
||||
MODULES_INSTALL_TARGET = "module-install"
|
||||
|
||||
RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit"
|
||||
MODULE_NAME = "wireguard"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
require wireguard.inc
|
||||
|
||||
SRCREV = "a8063adc8ae9b4fc9848500e93f94bee8ad2e585"
|
||||
SRCREV = "3ba6527130c502144e7388b900138bca6260f4e8"
|
||||
SRC_URI = "git://git.zx2c4.com/wireguard-tools;branch=master"
|
||||
|
||||
inherit bash-completion systemd pkgconfig
|
||||
|
|
@ -9,7 +9,7 @@ DEPENDS += "wireguard-module libmnl"
|
|||
|
||||
do_install () {
|
||||
oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \
|
||||
SYSTEMDUNITDIR="${systemd_unitdir}" \
|
||||
SYSTEMDUNITDIR="${systemd_system_unitdir}" \
|
||||
WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \
|
||||
WITH_BASHCOMPLETION=yes \
|
||||
WITH_WGQUICK=yes \
|
||||
Loading…
Reference in New Issue
Block a user