mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 05:49:57 +00:00
Code Issues Projects Releases Wiki Activity

wireguard-module: fix build issue with 5.4 kernel

Browse Source 
/tmp/work/qemux86_64-poky-linux/wireguard-module/1.0.20200401-r0/git/src/compat/compat-asm.h:44: warning: "SYM_FUNC_START" redefined
|    44 | #define SYM_FUNC_START ENTRY
|       |
| In file included from /tmp/work/qemux86_64-poky-linux/wireguard-module/1.0.20200401-r0/git/src/compat/compat-asm.h:9,
|                  from <command-line>:
| /tmp/work-shared/qemux86-64/kernel-source/include/linux/linkage.h:218: note: this is the location of the previous definition
|   218 | #define SYM_FUNC_START(name)    \
|       |
| In file included from <command-line>:
| /tmp/work/qemux86_64-poky-linux/wireguard-module/1.0.20200401-r0/git/src/compat/compat-asm.h:45: warning: "SYM_FUNC_END" redefined
|    45 | #define SYM_FUNC_END ENDPROC
|       |

Backporit fix from upstream

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2020-12-24 22:07:05 +00:00
parent 3e84d4caab
commit c70dcb9bd1
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-kernel/wireguard/files/0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch
+29
View File
@@ -0,0 +1,29 @@
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
meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb
+2 -1
View File
@@ -2,7 +2,8 @@ require wireguard.inc
SRCREV = "43f57dac7b8305024f83addc533c9eede6509129"
SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat"
SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat \
file://0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch"
inherit module kernel-module-split