* [PATCH V2 1/1] kernelshark/trace-cmd: fix syntax error of shell
2014-04-10 1:29 [PATCH V2 0/1] kernelshark/trace-cmd: fix syntax error of shell Chong Lu
@ 2014-04-10 1:29 ` Chong Lu
0 siblings, 0 replies; 2+ messages in thread
From: Chong Lu @ 2014-04-10 1:29 UTC (permalink / raw)
To: openembedded-core
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>
---
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 3 ++-
.../kernelshark-fix-syntax-error-of-shell.patch | 28 ++++++++++++++++++++++
.../trace-cmd-fix-syntax-error-of-shell.patch | 28 ++++++++++++++++++++++
meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb | 1 +
4 files changed, 59 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index 9268a50..d61097d 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 0000000..a3059f4
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
@@ -0,0 +1,28 @@
+kernelshark: fix syntax error of shell
+
+Delete "<<<" syntax of bash in Makefile, else we would get following error:
+
+ Syntax error: redirection unexpected
+
+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..c071e82
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
@@ -0,0 +1,28 @@
+trace-cmd: fix syntax error of shell
+
+Delete "<<<" syntax of bash in Makefile, else we would get following error:
+
+ Syntax error: redirection unexpected
+
+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 74eafbb..a0c823b 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"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 2+ messages in thread