From 80986e1182e6b1ef7eed177dfd06a884d639bd87 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 30 Nov 2011 17:58:52 -0800 Subject: trace-cmd: Update to 1.2 (includes kernelshark) Update the trace-cmd and kernelshark recipes to version 1.2. Rename the recipes to the more descriptive trace-cmd_1.2.bb and kernelshark_1.2.bb respectively. Update addldflags.patch for 1.2 and current Upstream-Status (Accepted). Add make-docs-optional.patch to avoid building the new doc target which requires asciidocs. We should add asciidocs and properly package the docs, but for now it's more important to get the sources current. (From OE-Core rev: 73ac48377491561151658617d8cc45936242eb0c) Signed-off-by: Darren Hart Signed-off-by: Richard Purdie --- meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 29 +++++++++++++++++ meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 28 ----------------- .../trace-cmd/trace-cmd/addldflags.patch | 28 +++++++++++------ .../trace-cmd/trace-cmd/make-docs-optional.patch | 36 ++++++++++++++++++++++ meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb | 23 ++++++++++++++ meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 22 ------------- 6 files changed, 106 insertions(+), 60 deletions(-) create mode 100644 meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb delete mode 100644 meta/recipes-kernel/trace-cmd/kernelshark_git.bb create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb delete mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd_git.bb diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb new file mode 100644 index 0000000000..aa070a9d9b --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Graphical trace viewer for Ftrace" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" + +SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" +PR = "r0" +PV = "1.2+git${SRCPV}" + +DEPENDS = "gtk+" +RDEPENDS_${PN} = "trace-cmd" + +inherit pkgconfig + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \ + file://addldflags.patch \ + file://make-docs-optional.patch" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" + +FILES_${PN} += "${datadir}/trace-cmd/plugins/*.so" +FILES_${PN}-dbg += "${datadir}/trace-cmd/plugins/.debug/" + +FILESPATH = "${FILE_DIRNAME}/trace-cmd" + +do_install() { + oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui +} diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb deleted file mode 100644 index 733bddcc20..0000000000 --- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Graphical trace viewer for Ftrace" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" - -SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49" -PR = r1 -PV = "1.0.5+git${SRCPV}" - -DEPENDS = "gtk+" -RDEPENDS_${PN} = "trace-cmd" - -inherit pkgconfig - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \ - file://addldflags.patch" -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" - -FILES_${PN} += "${datadir}/trace-cmd/plugins/*.so" -FILES_${PN}-dbg += "${datadir}/trace-cmd/plugins/.debug/" - -FILESPATH = "${FILE_DIRNAME}/trace-cmd" - -do_install() { - oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui -} diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch index 8e8f578e61..14730db905 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch @@ -1,29 +1,37 @@ -Upstream-Status: Pending +trace-cmd: Cross-compile fixes for LDFLAGS and include path Add ability for the Makefile to respect LDFLAGS. - Also remove hardcoded /usr/local/include include path. -RP 7/5/2011 +Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e] + +Signed-off-by: Richard Purdie +Signed-off-by: Darren Hart + +--- + Makefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) Index: git/Makefile =================================================================== ---- git.orig/Makefile 2011-07-05 11:58:11.699910550 +0100 -+++ git/Makefile 2011-07-05 23:30:12.319920617 +0100 -@@ -189,10 +189,11 @@ +--- git.orig/Makefile ++++ git/Makefile +@@ -202,12 +202,13 @@ export Q VERBOSE TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION) KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION) -INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) +INCLUDES = -I. $(CONFIG_INCLUDES) + include features.mk + # Set compile option CFLAGS if not set elsewhere CFLAGS ?= -g -Wall +LDFLAGS ?= - # Append required CFLAGS - override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) -@@ -225,7 +226,7 @@ + ifndef NO_PTRACE + ifneq ($(call try-cc,$(SOURCE_PTRACE),),y) +@@ -251,7 +252,7 @@ do_fpic_compile = \ do_app_build = \ ($(print_app_build) \ @@ -32,7 +40,7 @@ Index: git/Makefile do_compile_shared_library = \ ($(print_shared_lib_compile) \ -@@ -237,7 +238,7 @@ +@@ -263,7 +264,7 @@ do_compile_plugin_obj = \ do_plugin_build = \ ($(print_plugin_build) \ diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch new file mode 100644 index 0000000000..8402426c5f --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch @@ -0,0 +1,36 @@ +Disable building docs until we have asciidocs available as a recipe. + +Upstream-Status: Inappropriate [Account for missing dependency, the lazy way] + +Signed-off-by: Darren Hart + +--- + Makefile | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -327,7 +327,9 @@ TARGETS = $(CMD_TARGETS) $(GUI_TARGETS) + # If you want kernelshark, then do: make gui + ### + +-all: all_cmd doc show_gui_make ++# Make doc optional ++#all: all_cmd doc show_gui_make ++all: all_cmd show_gui_make + + all_cmd: $(CMD_TARGETS) + +@@ -503,7 +505,9 @@ install_python: $(PYTHON_SO_INSTALL) $(P + install_cmd: all_cmd install_plugins install_python + $(Q)$(call do_install,trace-cmd,$(bindir_SQ)) + +-install: install_cmd install_doc ++# Make doc optional ++#install: install_cmd install_doc ++install: install_cmd + @echo "Note: to install the gui, type \"make install_gui\"" + + install_gui: install_cmd gui diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb new file mode 100644 index 0000000000..1b9231bc12 --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "User interface to Ftrace" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" + +SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5" +PR = "r0" +PV = "1.2+git${SRCPV}" + +inherit pkgconfig + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \ + file://addldflags.patch \ + file://make-docs-optional.patch" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'prefix=${prefix}'" + +FILES_${PN}-dbg += "${datadir}/trace-cmd/plugins/.debug/" + +do_install() { + oe_runmake prefix="${prefix}" DESTDIR="${D}" install +} diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb deleted file mode 100644 index 1278dc7199..0000000000 --- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "User interface to Ftrace" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" - -SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49" -PR = "r2" -PV = "1.0.5+git${SRCPV}" - -inherit pkgconfig - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \ - file://addldflags.patch" -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "'prefix=${prefix}'" - -FILES_${PN}-dbg += "${datadir}/trace-cmd/plugins/.debug/" - -do_install() { - oe_runmake prefix="${prefix}" DESTDIR="${D}" install -} -- cgit v1.2.3-54-g00ecf