aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Le Foll <brendan.le.foll@intel.com>2014-01-22 15:50:42 -0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2014-05-09 12:16:33 +0100
commit462da6b298301dcc6a95085c780dcfff7acad8db (patch)
tree14762d81111ca80ab6b52663a3c1620a66e894cc
parent6861ddc584e6205db5cd4cb7d043473a4035e629 (diff)
downloadmeta-intel-quark-462da6b298301dcc6a95085c780dcfff7acad8db.tar.gz
meta-intel-quark-462da6b298301dcc6a95085c780dcfff7acad8db.tar.bz2
meta-intel-quark-462da6b298301dcc6a95085c780dcfff7acad8db.zip
linux: add upstream patch for librtraceevent to remove /usr/local from Makefile
(meta-clanton rev: 9c5898a9e679ddc4c7c551ac2b2572d5f2ada6b1) Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--recipes-kernel/linux/files/0001-libtraceevent-Remove-hard-coded-include-to-usr-local.patch37
-rw-r--r--recipes-kernel/linux/linux-yocto-clanton_3.8.bb1
2 files changed, 38 insertions, 0 deletions
diff --git a/recipes-kernel/linux/files/0001-libtraceevent-Remove-hard-coded-include-to-usr-local.patch b/recipes-kernel/linux/files/0001-libtraceevent-Remove-hard-coded-include-to-usr-local.patch
new file mode 100644
index 0000000..c11ead3
--- /dev/null
+++ b/recipes-kernel/linux/files/0001-libtraceevent-Remove-hard-coded-include-to-usr-local.patch
@@ -0,0 +1,37 @@
+From b9e8c37220c80e78289a1e87b50c09418eb59a7e Mon Sep 17 00:00:00 2001
+From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
+Date: Fri, 8 Mar 2013 11:21:52 +0000
+Subject: [PATCH] libtraceevent: Remove hard coded include to
+ /usr/local/include in Makefile
+
+having /usr/local/include hardcoded into the makefile is not necessary
+as this is automatically included by GCC. It also infects cross-compile
+builds with the host systems includes.
+
+Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
+Acked-by: Namhyung Kim <namhyung@kernel.org>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: Paul Mackerras <paulus@samba.org>
+Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Link: http://lkml.kernel.org/r/1362741712-21308-1-git-send-email-ml@communistcode.co.uk
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+---
+ tools/lib/traceevent/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
+index a20e320..0b0a907 100644
+--- a/tools/lib/traceevent/Makefile
++++ b/tools/lib/traceevent/Makefile
+@@ -122,7 +122,7 @@ export Q VERBOSE
+
+ EVENT_PARSE_VERSION = $(EP_VERSION).$(EP_PATCHLEVEL).$(EP_EXTRAVERSION)
+
+-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
++INCLUDES = -I. $(CONFIG_INCLUDES)
+
+ # Set compile option CFLAGS if not set elsewhere
+ CFLAGS ?= -g -Wall
+--
+1.8.5.3
+
diff --git a/recipes-kernel/linux/linux-yocto-clanton_3.8.bb b/recipes-kernel/linux/linux-yocto-clanton_3.8.bb
index 135338d..e6b23e9 100644
--- a/recipes-kernel/linux/linux-yocto-clanton_3.8.bb
+++ b/recipes-kernel/linux/linux-yocto-clanton_3.8.bb
@@ -51,6 +51,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
SRC_URI += "file://clanton.patch"
SRC_URI += "file://clanton.cfg"
SRC_URI += "file://clanton-standard.scc"
+SRC_URI += "file://0001-libtraceevent-Remove-hard-coded-include-to-usr-local.patch"
LINUX_VERSION ?= "3.8"
LINUX_VERSION_EXTENSION ?= "-clanton"