summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-07 11:17:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-07 11:37:13 (GMT)
commit41fc0ae69b05eee13c144ca790039f1780a1bf04 (patch)
treedf41176b97060230007bb5b4132958e4b68c1a50
parentff6de612f83e8027eb05ce85e5f8e2eae0916450 (diff)
downloadpoky-41fc0ae69b05eee13c144ca790039f1780a1bf04.tar.gz
linux-yocto-3.4: Disable extra slang header search path
Add in a workaround to avoid host infection detection build failures from the slang include directory in perf. I'll defer to Bruce to fix this properly but we need a workaround now as this is breaking builds. (From OE-Core rev: 4fd4b2eafb5f4ff2ef85d7f5ff3238a41c34313b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto/noslang.patch20
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb2
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto/noslang.patch b/meta/recipes-kernel/linux/linux-yocto/noslang.patch
new file mode 100644
index 0000000..9cada34
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto/noslang.patch
@@ -0,0 +1,20 @@
1We (OE) install slang into /usr/include so we never need to look into
2/usr/include/slang/. We never want to look into a hardcoded path like this
3since it triggers host infection issues. For now, simply remove this
4since it causes us problems.
5
6Upstream-Status: Pending (would need rework)
7
8Index: tools/perf/Makefile
9===================================================================
10--- linux.orig/tools/perf/Makefile 2012-08-07 10:29:43.020149620 +0000
11+++ linux/tools/perf/Makefile 2012-08-07 10:30:08.128148098 +0000
12@@ -504,7 +504,7 @@
13 BASIC_CFLAGS += -DNO_NEWT_SUPPORT
14 else
15 # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
16- BASIC_CFLAGS += -I/usr/include/slang
17+ # BASIC_CFLAGS += -I/usr/include/slang
18 EXTLIBS += -lnewt -lslang
19 LIB_OBJS += $(OUTPUT)util/ui/setup.o
20 LIB_OBJS += $(OUTPUT)util/ui/browser.o
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 48333b3..5ab46b7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -20,6 +20,8 @@ SRCREV_meta ?= "7ff48aa47c50b6455d60ca93bc81260ce8fe1a1b"
20 20
21SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 21SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
22 22
23SRC_URI += "file://noslang.patch"
24
23LINUX_VERSION ?= "3.4.6" 25LINUX_VERSION ?= "3.4.6"
24 26
25PR = "${INC_PR}.0" 27PR = "${INC_PR}.0"