[PATCH 1/2] trace-cmd: Update to version 2.5.2

[PATCH 1/2] trace-cmd: Update to version 2.5.2

[Ben Shelton]

Updating adds new features including the very useful 'profile' option.

Changes include:

 - Remove addldflags.patch (already upstream in the new version).

 - Remove make-docs-optional.patch (docs are built in a separate target
   in the new version).

 - Update SRC_URI, SRCREV, PR, and PV in the .inc file and don't
   override them in the recipe.

 - Fix a typo in LIC_FILES_CHECKSUM so 'endline' is properly defined.

Signed-off-by: Ben Shelton <ben.shelton@ni.com>
---
 meta/recipes-kernel/trace-cmd/trace-cmd.inc        | 12 ++---
 .../trace-cmd/trace-cmd/addldflags.patch           | 51 ----------------------
 .../trace-cmd/trace-cmd/make-docs-optional.patch   | 36 ---------------
 .../{trace-cmd_2.3.2.bb => trace-cmd_git.bb}       |  8 +---
 4 files changed, 7 insertions(+), 100 deletions(-)
 delete mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
 delete mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
 rename meta/recipes-kernel/trace-cmd/{trace-cmd_2.3.2.bb => trace-cmd_git.bb} (74%)

diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
index fb8c5fa..ed47d06 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd.inc
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
@@ -1,14 +1,14 @@
-SRCREV = "7055ffd37beeb44714e86a4abc703f7e175a0db5"
-PR = "r3"
-PV = "1.2+git${SRCPV}"
+# This is release 2.5.2 plus one commit to fix the kernelshark build.
+SRCREV = "cd0d29f41041d627fcc0d0446bfca697c20ee3c3"
+PR = "r4"
+PV = "2.5.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 \
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git;branch=trace-cmd-stable-v2.5 \
            file://blktrace-api-compatibility.patch \
 "
+
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
deleted file mode 100644
index 14730db..0000000
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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.
-
-Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e]
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-
----
- Makefile |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-Index: git/Makefile
-===================================================================
---- 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 ?=
- 
- ifndef NO_PTRACE
- ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
-@@ -251,7 +252,7 @@ do_fpic_compile =					\
- 
- do_app_build =						\
- 	($(print_app_build)				\
--	$(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))
-+	$(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
- 
- do_compile_shared_library =			\
- 	($(print_shared_lib_compile)		\
-@@ -263,7 +264,7 @@ do_compile_plugin_obj =				\
- 
- do_plugin_build =				\
- 	($(print_plugin_build)			\
--	$(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<)
- 
- do_build_static_lib =				\
- 	($(print_static_lib_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
deleted file mode 100644
index 8402426..0000000
--- a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 <dvhart@linux.intel.com>
-
----
- 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_2.3.2.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
similarity index 74%
rename from meta/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb
rename to meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
index a4d5382..b1ac789 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_2.3.2.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
@@ -6,13 +6,7 @@ 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=dafd8a1cade30b847a8686dd3628cea4 \
-"
-SRCREV = "79e08f8edb38c4c5098486caaa87ca90ba00f547"
-
-PV = "2.3.2+git${SRCPV}"
-
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git;branch=trace-cmd-stable-v2.3 \
+                    file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \
 "
 
 EXTRA_OEMAKE = "\
-- 
2.3.0

[PATCH 2/2] kernelshark: Update to version 2.5.2

[Ben Shelton]

Update to version 2.5.2 to match trace-cmd.

Changes include:

 - Remove kernelshark-fix-syntax-error-of-shell.patch (the syntax error
   is no longer present in the new version).

 - Specify bindir_relative and libdir in EXTRA_OEMAKE as in the
   trace-cmd recipe so files get installed to the right place.
   Additionally, remove unnecessary EXTRA_OEMAKE options.

 - Fix up the do_install steps to remove the plugins directory; that
   directory now lives under /usr/lib.

Signed-off-by: Ben Shelton <ben.shelton@ni.com>
---
 .../kernelshark-fix-syntax-error-of-shell.patch    | 30 ----------------------
 .../{kernelshark_1.2.bb => kernelshark_git.bb}     | 17 +++++++-----
 2 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
 rename meta/recipes-kernel/trace-cmd/{kernelshark_1.2.bb => kernelshark_git.bb} (58%)

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
deleted file mode 100644
index faef049..0000000
--- a/meta/recipes-kernel/trace-cmd/kernelshark/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 <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/kernelshark_1.2.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
similarity index 58%
rename from meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
rename to meta/recipes-kernel/trace-cmd/kernelshark_git.bb
index 28412c7..814e8bf 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
@@ -9,9 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 DEPENDS = "gtk+ libxml2"
 RDEPENDS_${PN} = "trace-cmd"
 
-SRC_URI_append = "file://kernelshark-fix-syntax-error-of-shell.patch"
-
-EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
+EXTRA_OEMAKE = "\
+    'prefix=${prefix}' \
+    'bindir_relative=${@oe.path.relative(prefix, bindir)}' \
+    'libdir=${@oe.path.relative(prefix, libdir)}' \
+    gui \
+"
 
 do_compile_prepend() {
     # Make sure the recompile is OK
@@ -19,8 +22,8 @@ do_compile_prepend() {
 }
 
 do_install() {
-	oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
-	rm ${D}${bindir}/trace-cmd
-	rm -rf ${D}${datadir}/trace-cmd
-	rmdir ${D}${datadir}
+    oe_runmake DESTDIR="${D}" install_gui
+    rm ${D}${bindir}/trace-cmd
+    rm -rf ${D}${libdir}/trace-cmd
+    rmdir ${D}${libdir}
 }
-- 
2.3.0

Re: [PATCH 2/2] kernelshark: Update to version 2.5.2

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

On 9 February 2015 at 16:52, Ben Shelton <ben.shelton@ni.com> wrote:

>  do_install() {
> -       oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}"
> install_gui
> -       rm ${D}${bindir}/trace-cmd
> -       rm -rf ${D}${datadir}/trace-cmd
> -       rmdir ${D}${datadir}
> +    oe_runmake DESTDIR="${D}" install_gui
> +    rm ${D}${bindir}/trace-cmd
> +    rm -rf ${D}${libdir}/trace-cmd
> +    rmdir ${D}${libdir}
>  }
>

For future reference, shell functions should be tab-indented (Python, 4
spaces).  I've fixed this when merging so there's no need to send a v2.

Ross

[-- Attachment #2: Type: text/html, Size: 1110 bytes --]

Re: [PATCH 2/2] kernelshark: Update to version 2.5.2

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 4433 bytes --]

Hi Ben,

This is failing on the autobuilder:

http://errors.yoctoproject.org/Errors/Details/8571/
http://errors.yoctoproject.org/Errors/Details/8572/

Two problems - an exception during build that is probably being ignored,
and then swing not found.  Is swig a non-deterministic dependency?

Ross

On 9 February 2015 at 16:52, Ben Shelton <ben.shelton@ni.com> wrote:

> Update to version 2.5.2 to match trace-cmd.
>
> Changes include:
>
>  - Remove kernelshark-fix-syntax-error-of-shell.patch (the syntax error
>    is no longer present in the new version).
>
>  - Specify bindir_relative and libdir in EXTRA_OEMAKE as in the
>    trace-cmd recipe so files get installed to the right place.
>    Additionally, remove unnecessary EXTRA_OEMAKE options.
>
>  - Fix up the do_install steps to remove the plugins directory; that
>    directory now lives under /usr/lib.
>
> Signed-off-by: Ben Shelton <ben.shelton@ni.com>
> ---
>  .../kernelshark-fix-syntax-error-of-shell.patch    | 30
> ----------------------
>  .../{kernelshark_1.2.bb => kernelshark_git.bb}     | 17 +++++++-----
>  2 files changed, 10 insertions(+), 37 deletions(-)
>  delete mode 100644
> meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
>  rename meta/recipes-kernel/trace-cmd/{kernelshark_1.2.bb =>
> kernelshark_git.bb} (58%)
>
> 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
> deleted file mode 100644
> index faef049..0000000
> ---
> a/meta/recipes-kernel/trace-cmd/kernelshark/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 <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/kernelshark_1.2.bb
> b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
> similarity index 58%
> rename from meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
> rename to meta/recipes-kernel/trace-cmd/kernelshark_git.bb
> index 28412c7..814e8bf 100644
> --- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
> +++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
> @@ -9,9 +9,12 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
>  DEPENDS = "gtk+ libxml2"
>  RDEPENDS_${PN} = "trace-cmd"
>
> -SRC_URI_append = "file://kernelshark-fix-syntax-error-of-shell.patch"
> -
> -EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
> +EXTRA_OEMAKE = "\
> +    'prefix=${prefix}' \
> +    'bindir_relative=${@oe.path.relative(prefix, bindir)}' \
> +    'libdir=${@oe.path.relative(prefix, libdir)}' \
> +    gui \
> +"
>
>  do_compile_prepend() {
>      # Make sure the recompile is OK
> @@ -19,8 +22,8 @@ do_compile_prepend() {
>  }
>
>  do_install() {
> -       oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}"
> install_gui
> -       rm ${D}${bindir}/trace-cmd
> -       rm -rf ${D}${datadir}/trace-cmd
> -       rmdir ${D}${datadir}
> +    oe_runmake DESTDIR="${D}" install_gui
> +    rm ${D}${bindir}/trace-cmd
> +    rm -rf ${D}${libdir}/trace-cmd
> +    rmdir ${D}${libdir}
>  }
> --
> 2.3.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 6352 bytes --]

Re: [PATCH 2/2] kernelshark: Update to version 2.5.2

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 832 bytes --]

On 12 February 2015 at 07:46, Burton, Ross <ross.burton@intel.com> wrote:

> This is failing on the autobuilder:
>
> http://errors.yoctoproject.org/Errors/Details/8571/
> http://errors.yoctoproject.org/Errors/Details/8572/
>
> Two problems - an exception during build that is probably being ignored,
> and then swing not found.  Is swig a non-deterministic dependency?
>

I had a quick look at this and it appears that despite having Python
build-depends (via trace-cmd.h) kernelshark for me locally doesn't build
with Python enabled.  Somehow the autobuilder managed to have an
environment that almost but not quite worked and so it tried to build...
and failed miserably as oe-core doesn't have a swig binary.

I guess this just needs NO_PYTON exported to stop the Python auto-detection
from happening.

Ross

[-- Attachment #2: Type: text/html, Size: 1471 bytes --]

Re: [PATCH 2/2] kernelshark: Update to version 2.5.2

[Ben Shelton]

On 02/12, Burton, Ross wrote:
> On 12 February 2015 at 07:46, Burton, Ross <ross.burton@intel.com> wrote:
> 
> > This is failing on the autobuilder:
> >
> > http://errors.yoctoproject.org/Errors/Details/8571/
> > http://errors.yoctoproject.org/Errors/Details/8572/
> >
> > Two problems - an exception during build that is probably being ignored,
> > and then swing not found.  Is swig a non-deterministic dependency?
> >
> 
> I had a quick look at this and it appears that despite having Python
> build-depends (via trace-cmd.h) kernelshark for me locally doesn't build
> with Python enabled.  Somehow the autobuilder managed to have an
> environment that almost but not quite worked and so it tried to build...
> and failed miserably as oe-core doesn't have a swig binary.
> 
> I guess this just needs NO_PYTON exported to stop the Python auto-detection
> from happening.
> 

Hi Ross,

This is already done in the EXTRA_OEMAKE in the trace-cmd recipe, but
not for the kernel-shark recipe -- I guess I didn't hit the error in my
local build.

Should I submit a patch to fix it?

Thanks,
Ben

> Ross

Re: [PATCH 2/2] kernelshark: Update to version 2.5.2

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 439 bytes --]

On 12 February 2015 at 16:03, Ben Shelton <ben.shelton@ni.com> wrote:

> This is already done in the EXTRA_OEMAKE in the trace-cmd recipe, but
> not for the kernel-shark recipe -- I guess I didn't hit the error in my
> local build.
>
> Should I submit a patch to fix it?
>

A revised patch would be awesome.  If both kernel-shark and trace-cmd
disable Python, why does trace-cmd.inc inherit python-dir and pythonnative?

Ross

[-- Attachment #2: Type: text/html, Size: 831 bytes --]

Re: [PATCH 2/2] kernelshark: Update to version 2.5.2

[Ben Shelton]

> 
> A revised patch would be awesome.  If both kernel-shark and trace-cmd
> disable Python, why does trace-cmd.inc inherit python-dir and pythonnative?
> 
> Ross

I see where trace-cmd inherits pythonnative, but I don't see where it
inherits python-dir.  It still builds OK for me if I don't inherit
pythonnative, so I'm not sure if/why that's needed.

Quick question on this: What do I need to do in my build setup to enable
Python in a similar way to what's done on the autobuilder so I can
reproduce the failure and verify it's fixed?

Thanks,
Ben