summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-03-07 12:12:09 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 16:50:52 +0100
commit604b2b2c6c0a9c09098fccf958c94ea7ba8b082b (patch)
tree8c6a98e13cabf97eec722d2168eb05bc1b29e464
parent0d91032b846d27d9474f42ba4a354bb7615cfc56 (diff)
downloadpoky-604b2b2c6c0a9c09098fccf958c94ea7ba8b082b.tar.gz
systemtap: Add patch to remove quotes
This fixes the -I include lines that are getting passed to the kernel macros [YOCTO #10990] (From OE-Core rev: b4d2f41a474c111e5fc64cae635d851386d860ba) (From OE-Core rev: d767d24edb32f2a4303579371df2e526cdbf5c04) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-buildrun-remove-quotes-around-I-include-line.patch38
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc1
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-buildrun-remove-quotes-around-I-include-line.patch b/meta/recipes-kernel/systemtap/systemtap/0001-buildrun-remove-quotes-around-I-include-line.patch
new file mode 100644
index 0000000000..7996fdde73
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-buildrun-remove-quotes-around-I-include-line.patch
@@ -0,0 +1,38 @@
1From 75c4aec6de3a615909f3283eac585760de101b8c Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Tue, 7 Mar 2017 10:46:12 -0800
4Subject: [PATCH] buildrun: remove quotes around -I include line
5
6By having the quotes, the kernel Makefile addtree macro adds the
7kernel $srctree directory as a prefix and causes compilation failures.
8Removing the quotes resolves the issue.
9
10This is trimmed from the verbose output of the GCC command line
11Before:
12 -I/srv/sdb/builds/4.9/tmp/work-shared/qemux86-64/kernel-source/"/srv/sdb/releases/jethro/builds/4.1/tmp/sysroots/x86_64-linux/usr/share/systemtap/runtime"
13
14After:
15 -I/srv/sdb/builds/4.9/tmp/sysroots/x86_64-linux/usr/share/systemtap/runtime
16
17Upstream-Status: Pending
18Signed-off-by: Saul Wold <sgw@linux.intel.com>
19---
20 buildrun.cxx | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/buildrun.cxx b/buildrun.cxx
24index aaea64c..8a8ee9f 100644
25--- a/buildrun.cxx
26+++ b/buildrun.cxx
27@@ -495,7 +495,7 @@ compile_pass (systemtap_session& s)
28 #if CHECK_POINTER_ARITH_PR5947
29 o << "EXTRA_CFLAGS += -Wpointer-arith" << endl;
30 #endif
31- o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;
32+ o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;
33 // XXX: this may help ppc toc overflow
34 // o << "CFLAGS := $(subst -Os,-O2,$(CFLAGS)) -fminimal-toc" << endl;
35 o << "obj-m := " << s.module_name << ".o" << endl;
36--
372.7.4
38
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index c9612308a5..a6aedd38a6 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -11,6 +11,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \
11 file://no-msgfmt-check.patch \ 11 file://no-msgfmt-check.patch \
12 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ 12 file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \
13 file://0001-Install-python-modules-to-correct-library-dir.patch \ 13 file://0001-Install-python-modules-to-correct-library-dir.patch \
14 file://0001-buildrun-remove-quotes-around-I-include-line.patch \
14 " 15 "
15 16
16# systemtap doesn't support mips 17# systemtap doesn't support mips