diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-11-15 17:51:25 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-11-18 17:07:53 +1000 |
| commit | df2ad45105036f5cf3d75bf26abbf013ec0f4090 (patch) | |
| tree | 2e1220d44f5a86cb62fa1e799bee184f00516d20 /recipes-kernel | |
| parent | 41b08199e5bb85d7c61c7c809265732dc4c89d40 (diff) | |
| download | meta-xilinx-df2ad45105036f5cf3d75bf26abbf013ec0f4090.tar.gz | |
linux-xlnx: Backport kernel change for traceevent
* The Makefile in traceevent has posioned the includes for cross builds
with /usr/local/include. This upstream patch has been back ported
(from linux-xlnx 3.10) to resolve this issue.
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-xlnx/libtraceevent-Remove-hard-coded-include-to-usr-local.patch | 38 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-xlnx_3.8.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-xlnx/libtraceevent-Remove-hard-coded-include-to-usr-local.patch b/recipes-kernel/linux/linux-xlnx/libtraceevent-Remove-hard-coded-include-to-usr-local.patch new file mode 100644 index 00000000..0168ea79 --- /dev/null +++ b/recipes-kernel/linux/linux-xlnx/libtraceevent-Remove-hard-coded-include-to-usr-local.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From b9e8c37220c80e78289a1e87b50c09418eb59a7e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> | ||
| 3 | Date: Fri, 8 Mar 2013 11:21:52 +0000 | ||
| 4 | Subject: [PATCH] libtraceevent: Remove hard coded include to | ||
| 5 | /usr/local/include in Makefile | ||
| 6 | |||
| 7 | having /usr/local/include hardcoded into the makefile is not necessary | ||
| 8 | as this is automatically included by GCC. It also infects cross-compile | ||
| 9 | builds with the host systems includes. | ||
| 10 | |||
| 11 | Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk> | ||
| 12 | Acked-by: Namhyung Kim <namhyung@kernel.org> | ||
| 13 | Cc: Ingo Molnar <mingo@redhat.com> | ||
| 14 | Cc: Paul Mackerras <paulus@samba.org> | ||
| 15 | Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> | ||
| 16 | Link: http://lkml.kernel.org/r/1362741712-21308-1-git-send-email-ml@communistcode.co.uk | ||
| 17 | Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> | ||
| 18 | Upstream-Status: Backport | ||
| 19 | --- | ||
| 20 | tools/lib/traceevent/Makefile | 2 +- | ||
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 22 | |||
| 23 | diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile | ||
| 24 | index a20e320..0b0a907 100644 | ||
| 25 | --- a/tools/lib/traceevent/Makefile | ||
| 26 | +++ b/tools/lib/traceevent/Makefile | ||
| 27 | @@ -122,7 +122,7 @@ export Q VERBOSE | ||
| 28 | |||
| 29 | EVENT_PARSE_VERSION = $(EP_VERSION).$(EP_PATCHLEVEL).$(EP_EXTRAVERSION) | ||
| 30 | |||
| 31 | -INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) | ||
| 32 | +INCLUDES = -I. $(CONFIG_INCLUDES) | ||
| 33 | |||
| 34 | # Set compile option CFLAGS if not set elsewhere | ||
| 35 | CFLAGS ?= -g -Wall | ||
| 36 | -- | ||
| 37 | 1.7.9.5 | ||
| 38 | |||
diff --git a/recipes-kernel/linux/linux-xlnx_3.8.bb b/recipes-kernel/linux/linux-xlnx_3.8.bb index a7d1c43e..c6fd35e4 100644 --- a/recipes-kernel/linux/linux-xlnx_3.8.bb +++ b/recipes-kernel/linux/linux-xlnx_3.8.bb | |||
| @@ -8,3 +8,4 @@ PR = "r1" | |||
| 8 | LINUX_VERSION = "3.8" | 8 | LINUX_VERSION = "3.8" |
| 9 | SRCREV = "f4ff79d44a966ebea6229213816d17eb472b303e" | 9 | SRCREV = "f4ff79d44a966ebea6229213816d17eb472b303e" |
| 10 | 10 | ||
| 11 | SRC_URI_append += "file://libtraceevent-Remove-hard-coded-include-to-usr-local.patch" | ||
