diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb index de716da..b254251 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb @@ -24,6 +24,8 @@ KMETA = "meta" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" +SRC_URI += "file://noslang.patch" + COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags commit 6b4ed64 Author: Richard Purdie Date: Tue Aug 7 22:21:22 2012 +0000 linux-yocto-3.0: Apply slang workaround fixing perf builds to 3.0 kernels too Signed-off-by: Richard Purdie diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index 2adbc46..3022f21 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb @@ -24,6 +24,8 @@ PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" +SRC_URI += "file://noslang.patch" + COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" # Functionality flags commit 4fd4b2e Author: Richard Purdie Date: Tue Aug 7 12:17:16 2012 +0100 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. Signed-off-by: Richard Purdie 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" --- Since you mentioned 'workaround' in commit log, I would like to submit another solution: #1. Merge below kernel patch to kernel tree: From 7708f74d98e7233c7257b055eea0ffb914f4ce2c Mon Sep 17 00:00:00 2001 From: Liang Li Date: Wed, 1 Aug 2012 14:31:24 +0800 Subject: [PATCH] perf: add SLANG_INC for slang.h Previously we hard code '-I/usr/include/slang' to CFLAGS to works with some hosts that has /usr/include/slang/slang.h other than /usr/include/slang.h like Fedora. This will cause compiling warnings in some cases. We'd better to provide user a chance to specify correct location of slang.h then user could specify SLANG_INC to avoid compile warnings. Signed-off-by: Liang Li --- tools/perf/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile b/tools/perf/Makefile index b7a7a87..067f2df 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -496,8 +496,10 @@ else msg := $(warning newt not found, disables TUI support. Please install newt-devel or libnewt-dev); 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 + # Some releases like Fedora has /usr/include/slang/slang.h other than /usr/include/slang.h + SLANG_INC ?= -I/usr/include/slang + BASIC_CFLAGS += $(SLANG_INC) + EXTLIBS += -lnewt -lslang LIB_OBJS += $(OUTPUT)ui/setup.o LIB_OBJS += $(OUTPUT)ui/browser.o -- #2. Set SLANG_INC to a reasonable directory in perf.bb: diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf_3.4.bb index 9c07fb7..d6900f9 100644 --- a/meta/recipes-kernel/perf/perf_3.4.bb +++ b/meta/recipes-kernel/perf/perf_3.4.bb @@ -63,6 +63,7 @@ EXTRA_OEMAKE = \ AR="${AR}" \ prefix=/usr \ NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \ + SLANG_INC=-I${STAGING_INCDIR} \ ' do_compile() {