Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-02-27 13:20:14 +0100
committerMichal Suchanek <msuchanek@suse.de>2019-07-09 22:47:21 +0200
commit2e2350c2b359a102692a74d3d98cb2aac5ff11bc (patch)
treee728610efb2afa8136186b42d7f4874ec72a8e60
parent709e0a43d43ded45f5b5ff4e64b8892e55748cc8 (diff)
BPF: UMH: do not detect if compiler can link userspace program
(boo#1127188).
-rw-r--r--patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch b/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
new file mode 100644
index 0000000000..508481f2f2
--- /dev/null
+++ b/patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
@@ -0,0 +1,36 @@
+From 60f1d000300603afcd18ed4a27a4a4af374d867a Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <msuchanek@suse.de>
+Date: Wed, 27 Feb 2019 13:11:22 +0100
+Subject: [PATCH] BPF: UMH: do not detect if compiler can link userspace
+ program.
+
+References: boo#1127188
+Patch-mainline: no, SUSE specific
+
+SUSE crosscompilers cannot build userspace programs. They do not include
+libc and related headers.
+
+The configuration files are updated using such crosscompilers leading to
+this UMH symbol flipping and build kernel build failures due to
+configuration differences.
+
+Signed-off-by: Michal Suchanek <msuchanek@suse.de>
+---
+ net/bpfilter/Kconfig | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig
+index e558b46596c4..2e9b6a8692ea 100644
+--- a/net/bpfilter/Kconfig
++++ b/net/bpfilter/Kconfig
+@@ -8,7 +8,6 @@ menuconfig BPFILTER
+ if BPFILTER
+ config BPFILTER_UMH
+ tristate "bpfilter kernel module with user mode helper"
+- depends on $(success,$(srctree)/scripts/cc-can-link.sh $(CC))
+ default m
+ help
+ This builds bpfilter kernel module with embedded user mode helper
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index c7dc531933..c77dce093f 100644
--- a/series.conf
+++ b/series.conf
@@ -35,6 +35,7 @@
########################################################
patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch
patches.rpmify/Add-ksym-provides-tool.patch
+ patches.rpmify/BPF-UMH-do-not-detect-if-compiler-can-link-userspace.patch
########################################################
#