diff options
2 files changed, 31 insertions, 1 deletions
diff --git a/meta-networking/recipes-kernel/wireguard/files/0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch b/meta-networking/recipes-kernel/wireguard/files/0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch new file mode 100644 index 0000000000..a9dc9dc2b7 --- /dev/null +++ b/meta-networking/recipes-kernel/wireguard/files/0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From ce8faa3ee266ea69431805e6ed4bd7102d982508 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Jason A. Donenfeld" <Jason@zx2c4.com> | ||
| 3 | Date: Thu, 12 Nov 2020 09:43:38 +0100 | ||
| 4 | Subject: [PATCH] compat: SYM_FUNC_{START,END} were backported to 5.4 | ||
| 5 | |||
| 6 | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> | ||
| 7 | |||
| 8 | Upstream-Status: Backport | ||
| 9 | Fixes build failure in Dunfell. | ||
| 10 | |||
| 11 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
| 12 | |||
| 13 | --- | ||
| 14 | compat/compat-asm.h | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | Index: src/compat/compat-asm.h | ||
| 18 | =================================================================== | ||
| 19 | --- src.orig/compat/compat-asm.h | ||
| 20 | +++ src/compat/compat-asm.h | ||
| 21 | @@ -40,7 +40,7 @@ | ||
| 22 | #undef pull | ||
| 23 | #endif | ||
| 24 | |||
| 25 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) | ||
| 26 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) | ||
| 27 | #define SYM_FUNC_START ENTRY | ||
| 28 | #define SYM_FUNC_END ENDPROC | ||
| 29 | #endif | ||
diff --git a/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb b/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb index 73199592c8..45324c02a1 100644 --- a/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb +++ b/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb | |||
| @@ -2,7 +2,8 @@ require wireguard.inc | |||
| 2 | 2 | ||
| 3 | SRCREV = "43f57dac7b8305024f83addc533c9eede6509129" | 3 | SRCREV = "43f57dac7b8305024f83addc533c9eede6509129" |
| 4 | 4 | ||
| 5 | SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat" | 5 | SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat \ |
| 6 | file://0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch" | ||
| 6 | 7 | ||
| 7 | inherit module kernel-module-split | 8 | inherit module kernel-module-split |
| 8 | 9 | ||
