[meta-oe,warrior,03/11] oprofile: make MACHINE_ARCH

Submitted by Martin Jansa on June 11, 2019, 4:54 p.m. | Patch ID: 162117

Details

Message ID 20190611165504.23049-3-Martin.Jansa@gmail.com
State New
Headers show

Commit Message

Martin Jansa June 11, 2019, 4:54 p.m.
* fixes:
ERROR: oprofile different signature for task do_configure.sigdata between hammerhead and mako
Hash for dependent task oprofile/oprofile_1.3.0.bb.do_prepare_recipe_sysroot changed from deecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bb to d4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0
Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb.do_prepare_recipe_sysroot with hashes deecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bb or d4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0

$ bitbake-diffsigs /OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1557963509/[hm]*/*/oprofile/*do_prepare*.sigdata*
runtaskdeps changed:
['autoconf/autoconf_2.69.bb.do_populate_sysroot:virtual:native automake/automake_1.16.1.bb.do_populate_sysroot:virtual:native binutils/binutils_2.32.bb.do_populate_sysroot gcc/gcc-cross_7.3.bb.do_populate_sysroot gcc/gcc-runtime_7.3.bb.do_populate_sysroot glibc/glibc_2.29.bb.do_populate_sysroot gnu-config/gnu-config_git.bb.do_populate_sysroot:virtual:native libtool/libtool-cross_2.4.6.bb.do_populate_sysroot libtool/libtool-native_2.4.6.bb.do_populate_sysroot', -linux/linux-lg-hammerhead_git.bb.do_populate_sysroot, +linux/linux-lg-mako_git.bb.do_populate_sysroot, 'oprofile/oprofile_1.3.0.bb.do_fetch pkgconfig/pkgconfig_git.bb.do_populate_sysroot:virtual:native popt/popt_1.16.bb.do_populate_sysroot']
linux/linux-lg-hammerhead_git.bb.do_populate_sysroot with hash e58e94601af73831ea51ca6cc18578c26b9b491bcadb82a2c590b22498447438
 changed to
linux/linux-lg-mako_git.bb.do_populate_sysroot with hash 4c7372d0063be9d5c96bfad20a2052ded3a7121a06027c21a75e79a4f6a678e3
Dependency on task linux/linux-lg-mako_git.bb.do_populate_sysroot was added with hash 4c7372d0063be9d5c96bfad20a2052ded3a7121a06027c21a75e79a4f6a678e3
Dependency on task linux/linux-lg-hammerhead_git.bb.do_populate_sysroot was removed with hash e58e94601af73831ea51ca6cc18578c26b9b491bcadb82a2c590b22498447438

* as detected with:
openembedded-core/scripts/sstate-diff-machines.sh --targets=world --tmpdir=tmp-glibc/ --analyze --machines="hammerhead mako qemux86"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb | 3 +++
 1 file changed, 3 insertions(+)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
index 1dc535ed8d..8d706e4a50 100644
--- a/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
+++ b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
@@ -3,6 +3,9 @@  require oprofile.inc
 DEPENDS += "virtual/kernel"
 DEPENDS_append_powerpc64 = " libpfm4"
 
+# Depends on MACHINE_ARCH kernel
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 SRC_URI[md5sum] = "bd998df5521ebedae31e71cd3fb6200b"
 SRC_URI[sha256sum] = "95ded8bde1ec39922f0af015981a67aec63e025a501e4dc04cd65d38f73647e6"
 

Comments

Adrian Bunk June 11, 2019, 7:33 p.m.
On Tue, Jun 11, 2019 at 04:54:56PM +0000, Martin Jansa wrote:
> * fixes:
> ERROR: oprofile different signature for task do_configure.sigdata between hammerhead and mako
> Hash for dependent task oprofile/oprofile_1.3.0.bb.do_prepare_recipe_sysroot changed from deecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bb to d4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0
> Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb.do_prepare_recipe_sysroot with hashes deecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bb or d4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0
> 
> $ bitbake-diffsigs /OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1557963509/[hm]*/*/oprofile/*do_prepare*.sigdata*
> runtaskdeps changed:
> ['autoconf/autoconf_2.69.bb.do_populate_sysroot:virtual:native automake/automake_1.16.1.bb.do_populate_sysroot:virtual:native binutils/binutils_2.32.bb.do_populate_sysroot gcc/gcc-cross_7.3.bb.do_populate_sysroot gcc/gcc-runtime_7.3.bb.do_populate_sysroot glibc/glibc_2.29.bb.do_populate_sysroot gnu-config/gnu-config_git.bb.do_populate_sysroot:virtual:native libtool/libtool-cross_2.4.6.bb.do_populate_sysroot libtool/libtool-native_2.4.6.bb.do_populate_sysroot', -linux/linux-lg-hammerhead_git.bb.do_populate_sysroot, +linux/linux-lg-mako_git.bb.do_populate_sysroot, 'oprofile/oprofile_1.3.0.bb.do_fetch pkgconfig/pkgconfig_git.bb.do_populate_sysroot:virtual:native popt/popt_1.16.bb.do_populate_sysroot']
> linux/linux-lg-hammerhead_git.bb.do_populate_sysroot with hash e58e94601af73831ea51ca6cc18578c26b9b491bcadb82a2c590b22498447438
>  changed to
> linux/linux-lg-mako_git.bb.do_populate_sysroot with hash 4c7372d0063be9d5c96bfad20a2052ded3a7121a06027c21a75e79a4f6a678e3
> Dependency on task linux/linux-lg-mako_git.bb.do_populate_sysroot was added with hash 4c7372d0063be9d5c96bfad20a2052ded3a7121a06027c21a75e79a4f6a678e3
> Dependency on task linux/linux-lg-hammerhead_git.bb.do_populate_sysroot was removed with hash e58e94601af73831ea51ca6cc18578c26b9b491bcadb82a2c590b22498447438
> 
> * as detected with:
> openembedded-core/scripts/sstate-diff-machines.sh --targets=world --tmpdir=tmp-glibc/ --analyze --machines="hammerhead mako qemux86"
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
> index 1dc535ed8d..8d706e4a50 100644
> --- a/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
> +++ b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
> @@ -3,6 +3,9 @@ require oprofile.inc
>  DEPENDS += "virtual/kernel"
>  DEPENDS_append_powerpc64 = " libpfm4"
>  
> +# Depends on MACHINE_ARCH kernel
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>...

Sorry that I missed this when it went into master,
but this looks bogus to me:

oprofile only needs the userspace kernel headers and shouldn't depend 
on virtual/kernel.

cu
Adrian
Martin Jansa June 11, 2019, 8:04 p.m.
fair point, I'll try to remove the dependency and see what breaks, it was
added couple years ago in:
https://git.openembedded.org/openembedded-core/commit/?id=16bc366877a2e02d96adb91b90e30710777e6f09
are you sure that the explanation from back then is no longer valid?

Looking at the oprofile history, oprofile->virtual/kernel was
in SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS back when oprofile was in oe-core:
http://git.openembedded.org/openembedded-core/commit/?id=5f470aed944c941b339652961a13266389288739

but this wasn't added to meta-oe/conf/layer.conf when it was imported from
oe-core in:
http://git.openembedded.org/meta-openembedded/commit/?id=22e6e7d5a8dd94de2986a9ce7c33e403b5ddb08d

On Tue, Jun 11, 2019 at 9:33 PM Adrian Bunk <bunk@stusta.de> wrote:

> On Tue, Jun 11, 2019 at 04:54:56PM +0000, Martin Jansa wrote:
> > * fixes:
> > ERROR: oprofile different signature for task do_configure.sigdata
> between hammerhead and mako
> > Hash for dependent task
> oprofile/oprofile_1.3.0.bb.do_prepare_recipe_sysroot changed from
> deecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bb to
> d4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0
> > Unable to find matching sigdata for
> /OE/build/luneos-master/webos-ports/meta-openembedded/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb.do_prepare_recipe_sysroot
> with hashes
> deecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bb or
> d4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0
> >
> > $ bitbake-diffsigs
> /OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1557963509/[hm]*/*/oprofile/*do_prepare*.sigdata*
> > runtaskdeps changed:
> > ['autoconf/autoconf_2.69.bb.do_populate_sysroot:virtual:native automake/
> automake_1.16.1.bb.do_populate_sysroot:virtual:native
> binutils/binutils_2.32.bb.do_populate_sysroot
> gcc/gcc-cross_7.3.bb.do_populate_sysroot
> gcc/gcc-runtime_7.3.bb.do_populate_sysroot
> glibc/glibc_2.29.bb.do_populate_sysroot gnu-config/gnu-config_git.bb.do_populate_sysroot:virtual:native
> libtool/libtool-cross_2.4.6.bb.do_populate_sysroot
> libtool/libtool-native_2.4.6.bb.do_populate_sysroot',
> -linux/linux-lg-hammerhead_git.bb.do_populate_sysroot, +linux/
> linux-lg-mako_git.bb.do_populate_sysroot, 'oprofile/oprofile_1.3.0.bb.do_fetch
> pkgconfig/pkgconfig_git.bb.do_populate_sysroot:virtual:native
> popt/popt_1.16.bb.do_populate_sysroot']
> > linux/linux-lg-hammerhead_git.bb.do_populate_sysroot with hash
> e58e94601af73831ea51ca6cc18578c26b9b491bcadb82a2c590b22498447438
> >  changed to
> > linux/linux-lg-mako_git.bb.do_populate_sysroot with hash
> 4c7372d0063be9d5c96bfad20a2052ded3a7121a06027c21a75e79a4f6a678e3
> > Dependency on task linux/linux-lg-mako_git.bb.do_populate_sysroot was
> added with hash
> 4c7372d0063be9d5c96bfad20a2052ded3a7121a06027c21a75e79a4f6a678e3
> > Dependency on task linux/linux-lg-hammerhead_git.bb.do_populate_sysroot
> was removed with hash
> e58e94601af73831ea51ca6cc18578c26b9b491bcadb82a2c590b22498447438
> >
> > * as detected with:
> > openembedded-core/scripts/sstate-diff-machines.sh --targets=world
> --tmpdir=tmp-glibc/ --analyze --machines="hammerhead mako qemux86"
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
> b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
> > index 1dc535ed8d..8d706e4a50 100644
> > --- a/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
> > +++ b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
> > @@ -3,6 +3,9 @@ require oprofile.inc
> >  DEPENDS += "virtual/kernel"
> >  DEPENDS_append_powerpc64 = " libpfm4"
> >
> > +# Depends on MACHINE_ARCH kernel
> > +PACKAGE_ARCH = "${MACHINE_ARCH}"
> >...
>
> Sorry that I missed this when it went into master,
> but this looks bogus to me:
>
> oprofile only needs the userspace kernel headers and shouldn't depend
> on virtual/kernel.
>
> cu
> Adrian
>
> --
>
>        "Is there not promise of rain?" Ling Tan asked suddenly out
>         of the darkness. There had been need of rain for many days.
>        "Only a promise," Lao Er said.
>                                        Pearl S. Buck - Dragon Seed
>
>
Adrian Bunk June 11, 2019, 8:31 p.m.
On Tue, Jun 11, 2019 at 10:04:03PM +0200, Martin Jansa wrote:
> fair point, I'll try to remove the dependency and see what breaks, it was
> added couple years ago in:
> https://git.openembedded.org/openembedded-core/commit/?id=16bc366877a2e02d96adb91b90e30710777e6f09
> are you sure that the explanation from back then is no longer valid?
>...

As far as I am aware this is the /usr/include/linux/perf_event.h
userspace kernel header.

Loking at configure.ac it seems more likely that any problems would come 
from there than a fundamental dependency on a specific kernel.

cu
Adrian