diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-07 12:17:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-07 12:37:13 +0100 |
commit | 41fc0ae69b05eee13c144ca790039f1780a1bf04 (patch) | |
tree | df41176b97060230007bb5b4132958e4b68c1a50 /meta/recipes-kernel/linux | |
parent | ff6de612f83e8027eb05ce85e5f8e2eae0916450 (diff) | |
download | ast2050-yocto-poky-41fc0ae69b05eee13c144ca790039f1780a1bf04.zip ast2050-yocto-poky-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>
Diffstat (limited to 'meta/recipes-kernel/linux')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto/noslang.patch | 20 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 2 |
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 @@ +We (OE) install slang into /usr/include so we never need to look into +/usr/include/slang/. We never want to look into a hardcoded path like this +since it triggers host infection issues. For now, simply remove this +since it causes us problems. + +Upstream-Status: Pending (would need rework) + +Index: tools/perf/Makefile +=================================================================== +--- linux.orig/tools/perf/Makefile 2012-08-07 10:29:43.020149620 +0000 ++++ linux/tools/perf/Makefile 2012-08-07 10:30:08.128148098 +0000 +@@ -504,7 +504,7 @@ + BASIC_CFLAGS += -DNO_NEWT_SUPPORT + else + # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h +- BASIC_CFLAGS += -I/usr/include/slang ++ # BASIC_CFLAGS += -I/usr/include/slang + EXTLIBS += -lnewt -lslang + LIB_OBJS += $(OUTPUT)util/ui/setup.o + 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" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" +SRC_URI += "file://noslang.patch" + LINUX_VERSION ?= "3.4.6" PR = "${INC_PR}.0" |