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 17:35:15 +0100 |
| commit | 29665931b669963028acfd24cf066b8a5ee3ee4f (patch) | |
| tree | 62f5ae550d9c177a18ffb10b68d6a65bc2346202 /meta/recipes-kernel/trace-cmd/trace-cmd | |
| parent | d1c17c57dbd8759469bbd490b64afd669c3a8478 (diff) | |
| download | ast2050-yocto-poky-29665931b669963028acfd24cf066b8a5ee3ee4f.zip ast2050-yocto-poky-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/trace-cmd/trace-cmd')
| -rw-r--r-- | meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch | 30 |
2 files changed, 60 insertions, 0 deletions
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 0000000..351b24b --- /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 0000000..b1ebf49 --- /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 + |
