summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-04-10 16:25:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-10 17:35:15 +0100
commit29665931b669963028acfd24cf066b8a5ee3ee4f (patch)
tree62f5ae550d9c177a18ffb10b68d6a65bc2346202 /meta/recipes-kernel
parentd1c17c57dbd8759469bbd490b64afd669c3a8478 (diff)
downloadpoky-29665931b669963028acfd24cf066b8a5ee3ee4f.tar.gz
kernelshark/trace-cmd: fix syntax error of shell
Delete "<<<" syntax of bash in Makefile, else we would get following error: Syntax error: redirection unexpected [YOCTO #6112] (From OE-Core rev: c2892fa27d9918aa4ce00a106a254ddfd44aa0f1) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb3
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch30
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch30
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb1
4 files changed, 63 insertions, 1 deletions
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index 9268a506b8..d61097df91 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -15,7 +15,8 @@ inherit pkgconfig pythonnative
15SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \ 15SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
16 file://addldflags.patch \ 16 file://addldflags.patch \
17 file://make-docs-optional.patch \ 17 file://make-docs-optional.patch \
18 file://blktrace-api-compatibility.patch" 18 file://blktrace-api-compatibility.patch \
19 file://kernelshark-fix-syntax-error-of-shell.patch"
19S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
20 21
21EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" 22EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
new file mode 100644
index 0000000000..351b24b82f
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
@@ -0,0 +1,30 @@
1kernelshark: fix syntax error of shell
2
3Delete "<<<" syntax of bash in Makefile, else we would get following error:
4
5 Syntax error: redirection unexpected
6
7Upstream-status: Pending
8
9Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
10---
11 Makefile | 3 +--
12 1 file changed, 1 insertion(+), 2 deletions(-)
13
14diff --git a/Makefile b/Makefile
15index c1fa906..be84415 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -89,8 +89,7 @@ endif
19
20 # $(call test-build, snippet, ret) -> ret if snippet compiles
21 # -> empty otherwise
22-test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \
23- <<<'$1' && echo y), $2)
24+test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2)
25
26 # have udis86 disassembler library?
27 udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
28--
291.7.9.5
30
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
new file mode 100644
index 0000000000..b1ebf49830
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
@@ -0,0 +1,30 @@
1trace-cmd: fix syntax error of shell
2
3Delete "<<<" syntax of bash in Makefile, else we would get following error:
4
5 Syntax error: redirection unexpected
6
7Upstream-status: Pending
8
9Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
10---
11 Makefile | 3 +--
12 1 file changed, 1 insertion(+), 2 deletions(-)
13
14diff --git a/Makefile b/Makefile
15index c1fa906..7973c53 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -89,8 +89,7 @@ endif
19
20 # $(call test-build, snippet, ret) -> ret if snippet compiles
21 # -> empty otherwise
22-test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \
23- <<<'$1' && echo y), $2)
24+test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2)
25
26 # have udis86 disassembler library?
27 udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
28--
291.7.9.5
30
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
index 74eafbb530..a0c823bf62 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
@@ -18,6 +18,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \
18 file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \ 18 file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
19 file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \ 19 file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \
20 file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \ 20 file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \
21 file://trace-cmd-fix-syntax-error-of-shell.patch \
21" 22"
22S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
23 24