Patchwork [2/3,for-dora] perf: split packging

login
register
mail settings
Submitter Henning Heinold
Date June 24, 2014, 9:34 p.m.
Message ID <1403645687-19655-3-git-send-email-henning@itconsulting-heinold.de>
Download mbox | patch
Permalink /patch/74303/
State New
Headers show

Comments

Henning Heinold - June 24, 2014, 9:34 p.m.
* 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 | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
Robert Yang - June 28, 2014, 2:39 a.m.
On 06/25/2014 05:34 AM, Henning Heinold wrote:
> * some fundamental perf commands can work
>    without the dependency on perl, python or bash
>    make them separate packages and RSUGGEST them
>
> * bump PR

Why you need bump the PR, please ?

// Robert

>
> The patch was sponsored by sysmocom
>
> Signed-off-by: Henning Heinold <henning@itconsulting-heinold.de>
> ---
>   meta/recipes-kernel/perf/perf.bb | 21 +++++++++++++++------
>   1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index 31c2c8e..e43f053 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
> @@ -124,6 +121,18 @@ python do_package_prepend() {
>
>   PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> -FILES_${PN} += "${libexecdir}/perf-core"
> +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}-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"
>

Patch

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 31c2c8e..e43f053 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
@@ -124,6 +121,18 @@  python do_package_prepend() {
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILES_${PN} += "${libexecdir}/perf-core"
+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}-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"