mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 09:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

kernelshark/trace-cmd: fix syntax error of shell

Browse Source 
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>
This commit is contained in:
Chong Lu
2014-04-10 16:25:03 +08:00
committed by Richard Purdie
parent d1c17c57db
commit 29665931b6
4 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
View File

@@ -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"

30
meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch Normal file
View File

@@ -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

30
meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch Normal file
View File

@@ -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

1
meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
View File

@@ -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"