Patchwork [V2] perf: split package

login
register
mail settings
Submitter Chong.Lu@windriver.com
Date July 21, 2014, 2:03 a.m.
Message ID <1405908237-7560-1-git-send-email-Chong.Lu@windriver.com>
Download mbox | patch
Permalink /patch/76155/
State New
Headers show

Comments

Chong.Lu@windriver.com - July 21, 2014, 2:03 a.m.
Currently, perf can't split to perf-archive, perf-tests, perf-python and
perf-perl. All files are included in perf package.
Change the files paths to make split successfully and add perf package
RDEPEND on the other four to keep it consistent.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 meta/recipes-kernel/perf/perf.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
Jacob Kroon - July 21, 2014, 10:16 a.m.
On Mon, Jul 21, 2014 at 4:03 AM, Chong Lu <Chong.Lu@windriver.com> wrote:

> Currently, perf can't split to perf-archive, perf-tests, perf-python and
> perf-perl. All files are included in perf package.
> Change the files paths to make split successfully and add perf package
> RDEPEND on the other four to keep it consistent.
>

Could it be that this is depending on which kernel version is building ?
I'm using Freescales 3.10.17 kernel, and my perf packages do have perl
scripts in perf-perl, python scripts in perl-python, etc.

/Jacob
Jacob Kroon - July 23, 2014, 5:34 p.m.
On Mon, Jul 21, 2014 at 4:03 AM, Chong Lu <Chong.Lu@windriver.com> wrote:

> Currently, perf can't split to perf-archive, perf-tests, perf-python and
> perf-perl. All files are included in perf package.
> Change the files paths to make split successfully and add perf package
> RDEPEND on the other four to keep it consistent.
>
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> ---
>  meta/recipes-kernel/perf/perf.bb | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/
> perf.bb
> index 20968f9..9f9741e 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -157,6 +157,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
>  PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
>
>  RDEPENDS_${PN} += "elfutils"
> +RDEPENDS_${PN} ?= "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
>

Is this correct ? First RDEPENDS is appended "elfutils", won't this make it
pointless to add a default value in the line below ?
Chong.Lu@windriver.com - July 24, 2014, 1:48 a.m.
On 07/24/2014 01:34 AM, Jacob Kroon wrote:
> On Mon, Jul 21, 2014 at 4:03 AM, Chong Lu <Chong.Lu@windriver.com 
> <mailto:Chong.Lu@windriver.com>> wrote:
>
>     Currently, perf can't split to perf-archive, perf-tests,
>     perf-python and
>     perf-perl. All files are included in perf package.
>     Change the files paths to make split successfully and add perf package
>     RDEPEND on the other four to keep it consistent.
>
>     Signed-off-by: Chong Lu <Chong.Lu@windriver.com
>     <mailto:Chong.Lu@windriver.com>>
>     ---
>      meta/recipes-kernel/perf/perf.bb <http://perf.bb> | 9 +++++----
>      1 file changed, 5 insertions(+), 4 deletions(-)
>
>     diff --git a/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
>     b/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
>     index 20968f9..9f9741e 100644
>     --- a/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
>     +++ b/meta/recipes-kernel/perf/perf.bb <http://perf.bb>
>     @@ -157,6 +157,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
>      PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
>
>      RDEPENDS_${PN} += "elfutils"
>     +RDEPENDS_${PN} ?= "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
>
>
> Is this correct ? First RDEPENDS is appended "elfutils", won't this 
> make it pointless to add a default value in the line below ?
Please ignore this patch, I just test in kernel 3.14, but maybe it 
depend on kernel version.

Thanks
Chong

Patch

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 20968f9..9f9741e 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -157,6 +157,7 @@  PACKAGE_ARCH = "${MACHINE_ARCH}"
 PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
 
 RDEPENDS_${PN} += "elfutils"
+RDEPENDS_${PN} ?= "${PN}-archive ${PN}-tests ${PN}-python ${PN}-perl"
 RDEPENDS_${PN}-archive =+ "bash"
 RDEPENDS_${PN}-python =+ "bash python"
 RDEPENDS_${PN}-perl =+ "bash perl perl-modules"
@@ -166,10 +167,10 @@  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}-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"
+FILES_${PN}-archive = "${exec_prefix}/libexec/perf-core/perf-archive"
+FILES_${PN}-tests = "${exec_prefix}/libexec/perf-core/tests"
+FILES_${PN}-python = "${libdir}/python*/site-packages ${exec_prefix}/libexec/perf-core/scripts/python"
+FILES_${PN}-perl = "${exec_prefix}/libexec/perf-core/scripts/perl"
 
 
 INHIBIT_PACKAGE_DEBUG_SPLIT="1"