[OE-core] [PATCH 1/1] kernelshark/trace-cmd: fix syntax error of shell

[Chong Lu]

On 04/04/2014 06:41 PM, Richard Purdie wrote:
> On Fri, 2014-04-04 at 16:33 +0800, Chong Lu wrote:
>> 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 at windriver.com>
>> ---
>>   meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb   |  3 ++-
>>   .../kernelshark-fix-syntax-error-of-shell.patch    | 30 ++++++++++++++++++++++
>>   .../trace-cmd-fix-syntax-error-of-shell.patch      | 30 ++++++++++++++++++++++
>>   meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb     |  1 +
>>   4 files changed, 63 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..994a9fa
>> --- /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: Inappropriate [embedded specific]
> How is this embedded specific?
>
> Cheers,
>
> Richard
This issue only produced in yocto.
It is not problem for kernelshark and trace-cmd itself.
So I think this is embedded specific.

Best Regards
Chong
>> +Signed-off-by: Chong Lu <Chong.Lu at 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..79abad5
>> --- /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: Inappropriate [embedded specific]
>> +
>> +Signed-off-by: Chong Lu <Chong.Lu at 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
>>
>
>
>