ndctl: make MACHINE_ARCH and ignore from libblockdev
PATCH 1/5 ndctl: make MACHINE_ARCH and ignore from libblockdev
* fixes:
ERROR: libblockdev different signature for task do_configure.sigdata between hammerhead and mako
Hash for dependent task libblockdev/libblockdev_2.20.bb.do_prepare_recipe_sysroot changed from bee357e6fd2c8479c9dbf9ccef6f30c416df1eb608b53a775383069a4215286b to 23a2ff7864fbd6d38b77918829651cff8d009702894ee670fab145c520d05be8
Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_2.20.bb.do_prepare_recipe_sysroot with hashes bee357e6fd2c8479c9dbf9ccef6f30c416df1eb608b53a775383069a4215286b or 23a2ff7864fbd6d38b77918829651cff8d009702894ee670fab145c520d05be8
ERROR: ndctl different signature for task do_configure.sigdata between hammerhead and mako
Hash for dependent task ndctl/ndctl_v63.bb.do_prepare_recipe_sysroot changed from ea34e9d64a9f30c3ed898bd3850e43e95297dacc560732e1d6bdfa961a6b357b to f886d72844b05c99cd241b8402d760d2c02e0264bfc66503d1e8742815463b3c
Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb.do_prepare_recipe_sysroot with hashes ea34e9d64a9f30c3ed898bd3850e43e95297dacc560732e1d6bdfa961a6b357b or f886d72844b05c99cd241b8402d760d2c02e0264bfc66503d1e8742815463b3c
$ bitbake-diffsigs /OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1557963509/[hm]*/*/ndctl/*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 bash-completion/bash-completion_2.8.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 json-c/json-c_0.13.1.bb.do_populate_sysroot kmod/kmod_git.bb.do_populate_sysroot 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, 'ndctl/ndctl_v63.bb.do_fetch pkgconfig/pkgconfig_git.bb.do_populate_sysroot:virtual:native systemd/systemd-systemctl-native.bb.do_populate_sysroot systemd/systemd_242.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
$ bitbake-diffsigs /OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1557963509/[hm]*/*/libblockdev/*do_prepare*.sigdata* Hash for dependent task ndctl/ndctl_v63.bb.do_populate_sysroot changed from 0d123eb0e330a9e34d199eb012da9ae2eb614063f9412725ef39a06b152341f1 to 40077996bc35ac047210928559ad692f4eb20e37b07ef675bf49c9c39c46fe1e Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v63.bb.do_populate_sysroot with hashes 0d123eb0e330a9e34d199eb012da9ae2eb614063f9412725ef39a06b152341f1 or 40077996bc35ac047210928559ad692f4eb20e37b07ef675bf49c9c39c46fe1e
as detected with:openembedded-core/scripts/sstate-diff-machines.sh --targets=world --tmpdir=tmp-glibc/ --analyze --machines="hammerhead mako qemux86"
--- meta-oe/conf/layer.conf | 6 ++++++ meta-oe/recipes-core/ndctl/ndctl_v63.bb | 3 +++ 2 files changed, 9 insertions(+)
meta-oe/conf/layer.conf +6 -0
@@ -51,6 +51,12 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->php \ " +# Depends on ndctl (through nvdimm PACKAGECONFIG) which depends on MACHINE_ARCH kernel +# and making libblockdev MACHINE_ARCH is not an option as python3-blivet, udisks2, gvfs +# would be MACHINE_ARCH as well +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ + libblockdev->ndctl \ +" # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ terminus-font->fontconfig \
meta-oe/recipes-core/ndctl/ndctl_v63.bb +3 -0
@@ -19,6 +19,9 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" +# Depends on MACHINE_ARCH kernel +PACKAGE_ARCH = "${MACHINE_ARCH}" + PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"
Signature · 1 line
2.17.1
PATCH 2/5 ndctl: Remove the unnecessary dependency on virtual/kernel
From: Adrian Bunk <[email protected]>
This also makes it no longer specific to MACHINE_ARCH.
--- meta-oe/conf/layer.conf | 6 ------ meta-oe/recipes-core/ndctl/ndctl_v63.bb | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-)
meta-oe/conf/layer.conf +0 -6
@@ -51,12 +51,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->php \ " -# Depends on ndctl (through nvdimm PACKAGECONFIG) which depends on MACHINE_ARCH kernel -# and making libblockdev MACHINE_ARCH is not an option as python3-blivet, udisks2, gvfs -# would be MACHINE_ARCH as well -SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ - libblockdev->ndctl \ -" # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ terminus-font->fontconfig \
meta-oe/recipes-core/ndctl/ndctl_v63.bb +1 -4
@@ -13,15 +13,12 @@ inherit autotools-brokensep pkgconfig bash-completion systemd SRCREV = "cb2d678dd6d286dd96d31548c32449a8b883ae32" SRC_URI = "git://github.com/pmem/ndctl.git" -DEPENDS = "virtual/kernel kmod udev json-c" +DEPENDS = "kmod udev json-c" S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-test --enable-destructive --disable-docs" -# Depends on MACHINE_ARCH kernel -PACKAGE_ARCH = "${MACHINE_ARCH}" - PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd, systemd"
Signature · 1 line
2.17.1
PATCH 3/5 oprofile: make MACHINE_ARCH
In reply to Martin Jansa* 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"
--- meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb +3 -0
@@ -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"
Signature · 1 line
2.17.1
PATCH 4/5 oprofile: drop virtual/kernel dependency and switch back to TUNE_PKGARCH
In reply to Martin JansaFrom: Martin Jansa <[email protected]>
* the kernel dependency was added couple years ago with:
https://git.openembedded.org/openembedded-core/commit/?id=16bc366877a2e02d96adb91b90e30710777e6f09
the reasons for it no longer seem valid as it build ok without the dependency
* there as some differences in the resulting binaries (built with and without
kernel dependency):
docker-shr qemux86-64@ ~/build/oe-core $ diff -rq tmp-glibc/work/*/oprofile/*/image
Files tmp-glibc/work/core2-64-oe-linux/oprofile/1.3.0-r0-without-kernel-dep/image/usr/bin/ocount and tmp-glibc/work/qemux86_64-oe-linux/oprofile/1.3.0-r0-with-kernel-dep/image/usr/bin/ocount differ Files tmp-glibc/work/core2-64-oe-linux/oprofile/1.3.0-r0-without-kernel-dep/image/usr/bin/opannotate and tmp-glibc/work/qemux86_64-oe-linux/oprofile/1.3.0-r0-with-kernel-dep/image/usr/bin/opannotate differ Files tmp-glibc/work/core2-64-oe-linux/oprofile/1.3.0-r0-without-kernel-dep/image/usr/bin/oparchive and tmp-glibc/work/qemux86_64-oe-linux/oprofile/1.3.0-r0-with-kernel-dep/image/usr/bin/oparchive differ Files tmp-glibc/work/core2-64-oe-linux/oprofile/1.3.0-r0-without-kernel-dep/image/usr/bin/operf and tmp-glibc/work/qemux86_64-oe-linux/oprofile/1.3.0-r0-with-kernel-dep/image/usr/bin/operf differ Files tmp-glibc/work/core2-64-oe-linux/oprofile/1.3.0-r0-without-kernel-dep/image/usr/bin/opgprof and tmp-glibc/work/qemux86_64-oe-linux/oprofile/1.3.0-r0-with-kernel-dep/image/usr/bin/opgprof differ Files tmp-glibc/work/core2-64-oe-linux/oprofile/1.3.0-r0-without-kernel-dep/image/usr/bin/ophelp and tmp-glibc/work/qemux86_64-oe-linux/oprofile/1.3.0-r0-with-kernel-dep/image/usr/bin/ophelp differ Files tmp-glibc/work/core2-64-oe-linux/oprofile/1.3.0-r0-without-kernel-dep/image/usr/bin/opimport and tmp-glibc/work/qemux86_64-oe-linux/oprofile/1.3.0-r0-with-kernel-dep/image/usr/bin/opimport differ Files tmp-glibc/work/core2-64-oe-linux/oprofile/1.3.0-r0-without-kernel-dep/image/usr/bin/opreport and tmp-glibc/work/qemux86_64-oe-linux/oprofile/1.3.0-r0-with-kernel-dep/image/usr/bin/opreport differ
* comparing the first one with diffoscope shows only 2 insignificant changes:
- GNU 0x00000014 NT_GNU_BUILD_ID (unique build ID bitstring) Build ID: 71d68718f2b1393cce55605691453ca0615a985d + GNU 0x00000014 NT_GNU_BUILD_ID (unique build ID bitstring) Build ID: 3b6d2e8b3ce02b99a41e594fafb756e5648edd3c
- 0x0041ab00 31203230 31390032 323a3334 3a333100 1 2019.22:34:31.
+ 0x0041ab00 31203230 31390032 323a3239 3a303600 1 2019.22:29:06.
* similarly for other binaries
--- meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb | 4 ---- 1 file changed, 4 deletions(-)
meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb +0 -4
@@ -1,11 +1,7 @@ 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"
Signature · 1 line
2.17.1
PATCH 5/5 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS add lsb, busybox and util-linux for phoronix-test-suite
In reply to Martin Jansa* phoronix-test-suite is allarch, but util-linux and lsb aren't
=== Comparing signatures for task do_package_write_ipk.sigdata between qemux86 and qemux86copy ===
ERROR: phoronix-test-suite different signature for task do_package_write_ipk.sigdata between qemux86 and qemux86copy Hash for dependent task lsb/lsb_5.0.bb.do_packagedata changed from 7baca400e354b600fe967ea615032052 to 67888a6c7511339a873b547745287ef2
--- meta-oe/conf/layer.conf | 3 +++ 1 file changed, 3 insertions(+)
meta-oe/conf/layer.conf +3 -0
@@ -49,6 +49,9 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ phoronix-test-suite->bash \ phoronix-test-suite->python \ phoronix-test-suite->php \ + phoronix-test-suite->lsb \ + phoronix-test-suite->util-linux \ + phoronix-test-suite->busybox \ " # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS
Signature · 1 line
2.17.1