From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: "Ashfield, Bruce" <Bruce.Ashfield@windriver.com>,
openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH] linux-yocto-3.4: Disable extra slang header search path
Date: Tue, 07 Aug 2012 12:17:16 +0100 [thread overview]
Message-ID: <1344338236.9756.218.camel@ted> (raw)
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 <richard.purdie@linuxfoundation.org>
---
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
--- a/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"
next reply other threads:[~2012-08-07 11:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-07 11:17 Richard Purdie [this message]
2012-08-07 12:53 ` [PATCH] linux-yocto-3.4: Disable extra slang header search path Bruce Ashfield
2012-08-07 13:24 ` Bruce Ashfield
2012-08-07 13:50 ` Richard Purdie
2012-08-07 13:59 ` Bruce Ashfield
2012-08-08 2:16 ` McClintock Matthew-B29882
2012-08-08 2:18 ` Bruce Ashfield
2012-08-08 2:22 ` Bruce Ashfield
2012-08-08 2:25 ` McClintock Matthew-B29882
2012-08-08 2:30 ` Bruce Ashfield
2012-08-09 19:17 ` McClintock Matthew-B29882
2012-08-09 19:38 ` Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344338236.9756.218.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=Bruce.Ashfield@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox