[PATCH 0/3] perf packaging improvements and fixes

[PATCH 0/3] perf packaging improvements and fixes

[Henning Heinold]

This series improves the packaging of perf,
by splitting it up. So only the scripts
which needs python, perl or bash have the needed dependencies.

One minor bug in shell comparsion was fixed.

Slang was added for tui so it will work with older and newer kernels.

I tested the series for perf top only, which works on
qemuarm.

The series was sponsored by sysmocom and are mentioned
according to http://lists.openembedded.org/pipermail/openembedded-core/2013-December/087190.html

Henning Heinold (3):
  perf: add slang to the dependencies
  perf: fix broken shell comparsion in do_install
  perf: split packging

 meta/recipes-kernel/perf/perf.bb | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

-- 
1.9.1

[PATCH 1/3] perf: add slang to the dependencies

[Henning Heinold]

* some kernels depends on newt, some on slang and some on boths
* changing TUI_DEFINES is not necessary, because NO_NEWT is
  compatible with all kernels

The patch was sponsored by sysmocom

Signed-off-by: Henning Heinold <henning@itconsulting-heinold.de>
---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index ef21b6c..adbecfd 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -15,7 +15,7 @@ require perf-features.inc
 
 BUILDPERF_libc-uclibc = "no"
 
-TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt', '',d)}"
+TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt slang', '',d)}"
 SCRIPTING_DEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl python', '',d)}"
 
 DEPENDS = "virtual/kernel \
-- 
1.9.1

[PATCH 2/3] perf: fix broken shell comparsion in do_install

[Henning Heinold]

The patch was sponsored by sysmocom

Signed-off-by: Henning Heinold <henning@itconsulting-heinold.de>
---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index adbecfd..74686ca 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -112,7 +112,7 @@ do_install() {
 	unset CFLAGS
 	oe_runmake DESTDIR=${D} install
 	# we are checking for this make target to be compatible with older perf versions
-	if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0"]; then
+	if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0" ]; then
 		oe_runmake DESTDIR=${D} install-python_ext
 	fi
 }
-- 
1.9.1

[PATCH 3/3] perf: split packging

[Henning Heinold]

* some fundamental perf commands can work
  without the dependency on perl, python or bash
  make them separate packages and RSUGGEST them

* bump PR

The patch was sponsored by sysmocom

Signed-off-by: Henning Heinold <henning@itconsulting-heinold.de>
---
 meta/recipes-kernel/perf/perf.bb | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 74686ca..daa7c3f 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -9,7 +9,7 @@ as well."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-PR = "r8"
+PR = "r9"
 
 require perf-features.inc
 
@@ -27,9 +27,6 @@ DEPENDS = "virtual/kernel \
            bison flex \
           "
 
-SCRIPTING_RDEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl perl-modules python', '',d)}"
-RDEPENDS_${PN} += "elfutils bash ${SCRIPTING_RDEPENDS}"
-
 PROVIDES = "virtual/perf"
 
 inherit linux-kernel-base kernel-arch pythonnative
@@ -153,8 +150,23 @@ python do_package_prepend() {
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+
+PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
+
+RDEPENDS_${PN} += "elfutils"
+RDEPENDS_${PN}-archive =+ "bash"
+RDEPENDS_${PN}-python =+ "bash python"
+RDEPENDS_${PN}-perl =+ "bash perl perl-modules"
+
+RSUGGESTS_SCRIPTING = "${@perf_feature_enabled('perf-scripting', '${PN}-perl ${PN}-python', '',d)}"
+RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
+
 FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent"
 FILES_${PN}-dbg += "${libdir}/python*/site-packages/.debug"
-FILES_${PN} += "${libdir}/python*/site-packages"
+FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
+FILES_${PN}-tests = "${libdir}/perf/perf-core/tests"
+FILES_${PN}-python = "${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python"
+FILES_${PN}-perl = "${libdir}/perf/perf-core/scripts/perl"
+
 
 INHIBIT_PACKAGE_DEBUG_SPLIT="1"
-- 
1.9.1

Re: [PATCH 2/3] perf: fix broken shell comparsion in do_install

[Bruce Ashfield]

When describing something as broken in the short log, it's typically a good
idea to also include the symptoms, and the fix. That way the log will tell
someone experience a particular problem that this change indeed addresses
their problem.

Bruce

On Mon, Jun 9, 2014 at 5:21 PM, Henning Heinold
<henning@itconsulting-heinold.de> wrote:
> The patch was sponsored by sysmocom
>
> Signed-off-by: Henning Heinold <henning@itconsulting-heinold.de>
> ---
>  meta/recipes-kernel/perf/perf.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index adbecfd..74686ca 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -112,7 +112,7 @@ do_install() {
>         unset CFLAGS
>         oe_runmake DESTDIR=${D} install
>         # we are checking for this make target to be compatible with older perf versions
> -       if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0"]; then
> +       if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0" ]; then
>                 oe_runmake DESTDIR=${D} install-python_ext
>         fi
>  }
> --
> 1.9.1
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Re: [PATCH 2/3] perf: fix broken shell comparsion in do_install

[Henning Heinold]

On Mon, Jun 09, 2014 at 08:35:06PM -0400, Bruce Ashfield wrote:
> When describing something as broken in the short log, it's typically a good
> idea to also include the symptoms, and the fix. That way the log will tell
> someone experience a particular problem that this change indeed addresses
> their problem.
> 
> Bruce

Hi Bruce,

there was no error shown, the build succeeded always. I stumbled over it
by reading the bb file.

Bye Henning

Re: [PATCH 1/3] perf: add slang to the dependencies

[Richard Purdie]

On Mon, 2014-06-09 at 23:21 +0200, Henning Heinold wrote:
> * some kernels depends on newt, some on slang and some on boths
> * changing TUI_DEFINES is not necessary, because NO_NEWT is
>   compatible with all kernels
> 
> The patch was sponsored by sysmocom
> 
> Signed-off-by: Henning Heinold <henning@itconsulting-heinold.de>
> ---
>  meta/recipes-kernel/perf/perf.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index ef21b6c..adbecfd 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -15,7 +15,7 @@ require perf-features.inc
>  
>  BUILDPERF_libc-uclibc = "no"
>  
> -TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt', '',d)}"
> +TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt slang', '',d)}"
>  SCRIPTING_DEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl python', '',d)}"

Can we put a comment in the recipe about the problem here so that we
remember why we have the dependencies when looking back in the future
please?

Cheers,

Richard