diff options
| author | Chong Lu <Chong.Lu@windriver.com> | 2014-04-10 16:25:03 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-10 10:22:26 +0100 |
| commit | c2892fa27d9918aa4ce00a106a254ddfd44aa0f1 (patch) | |
| tree | a6011aa536df553ee10d70cf3e3a524274bd2c1f /meta/recipes-kernel/trace-cmd | |
| parent | 400b4bce34ffb76e500e2195104cc200218aa4c3 (diff) | |
| download | openembedded-core-c2892fa27d9918aa4ce00a106a254ddfd44aa0f1.tar.gz openembedded-core-c2892fa27d9918aa4ce00a106a254ddfd44aa0f1.tar.bz2 openembedded-core-c2892fa27d9918aa4ce00a106a254ddfd44aa0f1.zip | |
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]
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/trace-cmd')
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 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git \ file://addldflags.patch \ file://make-docs-optional.patch \ - file://blktrace-api-compatibility.patch" + file://blktrace-api-compatibility.patch \ + file://kernelshark-fix-syntax-error-of-shell.patch" S = "${WORKDIR}/git" EXTRA_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 @@ +kernelshark: fix syntax error of shell + +Delete "<<<" syntax of bash in Makefile, else we would get following error: + + Syntax error: redirection unexpected + +Upstream-status: Pending + +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index c1fa906..be84415 100644 +--- a/Makefile ++++ b/Makefile +@@ -89,8 +89,7 @@ endif + + # $(call test-build, snippet, ret) -> ret if snippet compiles + # -> empty otherwise +-test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \ +- <<<'$1' && echo y), $2) ++test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2) + + # have udis86 disassembler library? + udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86) +-- +1.7.9.5 + 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 @@ +trace-cmd: fix syntax error of shell + +Delete "<<<" syntax of bash in Makefile, else we would get following error: + + Syntax error: redirection unexpected + +Upstream-status: Pending + +Signed-off-by: Chong Lu <Chong.Lu@windriver.com> +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index c1fa906..7973c53 100644 +--- a/Makefile ++++ b/Makefile +@@ -89,8 +89,7 @@ endif + + # $(call test-build, snippet, ret) -> ret if snippet compiles + # -> empty otherwise +-test-build = $(if $(shell $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 \ +- <<<'$1' && echo y), $2) ++test-build = $(if $(shell echo '$1' |$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y), $2) + + # have udis86 disassembler library? + udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86) +-- +1.7.9.5 + 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 \ file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \ file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \ file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \ + file://trace-cmd-fix-syntax-error-of-shell.patch \ " S = "${WORKDIR}/git" |