From bc57d7041e126850245e4a5ab0211979b49b97ff Mon Sep 17 00:00:00 2001 From: Petter Mabäcker Date: Mon, 12 May 2014 15:55:29 +0200 Subject: trace-cmd: refactoring recipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes [YOCTO #4497] Refactoring recipe to avoid duplicated entries in trace-cmd and kernelshark bb-files. Also remove usage of FILESPATH and split package unique patches into separate dirs. Signed-off-by: Petter Mabäcker Signed-off-by: Richard Purdie --- .../kernelshark-fix-syntax-error-of-shell.patch | 30 ++++++++++++++++++++++ meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 18 +++---------- meta/recipes-kernel/trace-cmd/trace-cmd.inc | 14 ++++++++++ .../kernelshark-fix-syntax-error-of-shell.patch | 30 ---------------------- meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb | 16 +++--------- 5 files changed, 52 insertions(+), 56 deletions(-) create mode 100644 meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd.inc delete mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch diff --git a/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch b/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch new file mode 100644 index 0000000000..faef049fec --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/kernelshark/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 +--- + 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 ,-DHAVE_UDIS86 -ludis86) +-- +1.7.9.5 + diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb index d61097df91..e64abe2ecc 100644 --- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb +++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb @@ -1,28 +1,18 @@ SUMMARY = "Graphical trace viewer for Ftrace" LICENSE = "GPLv2" + +require trace-cmd.inc + LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" -SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" -PR = "r3" -PV = "1.2+git${SRCPV}" - DEPENDS = "gtk+" RDEPENDS_${PN} = "trace-cmd" -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://kernelshark-fix-syntax-error-of-shell.patch" -S = "${WORKDIR}/git" +SRC_URI_append = "file://kernelshark-fix-syntax-error-of-shell.patch" EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" -FILESPATH = "${FILE_DIRNAME}/trace-cmd" - do_install() { oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui rm -rf ${D}${datadir}/trace-cmd diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/meta/recipes-kernel/trace-cmd/trace-cmd.inc new file mode 100644 index 0000000000..fb8c5fa7f7 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc @@ -0,0 +1,14 @@ +SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" +PR = "r3" +PV = "1.2+git${SRCPV}" + +inherit pkgconfig pythonnative + +FILESEXTRAPATHS =. "${FILE_DIRNAME}/trace-cmd:" + +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 \ +" +S = "${WORKDIR}/git" 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 deleted file mode 100644 index faef049fec..0000000000 --- a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 ---- - 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 ,-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 a0c823bf62..6f3319dfd1 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb +++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb @@ -1,26 +1,18 @@ SUMMARY = "User interface to Ftrace" LICENSE = "GPLv2 & LGPLv2.1" + +require trace-cmd.inc + LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \ file://trace-input.c;beginline=5;endine=8;md5=6ad47cc2b03385d8456771eec5eeea0b" -SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" -PR = "r3" -PV = "1.2+git${SRCPV}" - -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://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \ +SRC_URI_append = "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" EXTRA_OEMAKE = "'prefix=${prefix}'" -- cgit 1.2.3-korg