gtkwave: add distro_features_check
PATCH 1/11 gtkwave: add distro_features_check
* fixes:
ERROR: Nothing PROVIDES 'gtk+' (but /OE/build/luneos-warrior/webos-ports/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb DEPENDS on or otherwise requires it) gtk+ was skipped: one of 'x11 directfb' needs to be in DISTRO_FEATURES
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'gtkwave', 'gtk+']
and
ERROR: Nothing PROVIDES 'tk' (but /OE/build/luneos-warrior/webos-ports/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb DEPENDS on or otherwise requires it) tk was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'gtkwave', 'tk']
--- meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +4 -0
@@ -14,6 +14,10 @@ inherit pkgconfig autotools gettext texinfo DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" RDEPENDS_${PN} = "tk-lib" +# depends on gtk+ which has this restriction +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS}" FILES_${PN} = "${bindir} ${datadir}"
Signature · 1 line
2.17.1
PATCH 2/11 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 3/11 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
Re: [meta-oe][warrior][PATCH 03/11] oprofile: make MACHINE_ARCH
Quoted 27 lines · 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 fromdeecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bbtod4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0
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 hashesdeecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bbord4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0$ 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 <[email protected]>--- 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 +0
-0
meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb require oprofile.inc · line 7
Quoted 6 lines
meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb +2
-0@@ -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
Signature · 4 lines
"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 SeedRe: [meta-oe][warrior][PATCH 03/11] oprofile: make MACHINE_ARCH
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
Quoted 80 lines · Adrian Bunk
Quoted 2 lines · Martin Jansa
* fixes:
ERROR: oprofile different signature for task do_configure.sigdatabetween hammerhead and mako
Quoted 1 line
Hash for dependent task
oprofile/oprofile_1.3.0.bb.do_prepare_recipe_sysroot changed from
deecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bbtod4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0Quoted 1 line
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
deecd34bc94f47935ce3dc7f83f9a8407269959e446518bd9700a2ebae4324bbord4d6301a72fcd061c167a6715372a6e35f57bf08152a6223b1571957834428f0Quoted 2 lines
$ bitbake-diffsigs/OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1557963509/[hm]*/*/oprofile/*do_prepare*.sigdata*
Quoted 2 lines
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']Quoted 1 line
linux/linux-lg-hammerhead_git.bb.do_populate_sysroot with hash
e58e94601af73831ea51ca6cc18578c26b9b491bcadb82a2c590b22498447438Quoted 2 lines
changed to
linux/linux-lg-mako_git.bb.do_populate_sysroot with hash
4c7372d0063be9d5c96bfad20a2052ded3a7121a06027c21a75e79a4f6a678e3Quoted 1 line
Dependency on task linux/linux-lg-mako_git.bb.do_populate_sysroot was
added with hash
4c7372d0063be9d5c96bfad20a2052ded3a7121a06027c21a75e79a4f6a678e3Quoted 1 line
Dependency on task linux/linux-lg-hammerhead_git.bb.do_populate_sysroot
was removed with hash
e58e94601af73831ea51ca6cc18578c26b9b491bcadb82a2c590b22498447438Quoted 3 lines
* as detected with:
openembedded-core/scripts/sstate-diff-machines.sh--targets=world--tmpdir=tmp-glibc/ --analyze --machines="hammerhead mako qemux86"
Review
Quoted 7 lines
Signed-off-by Martin Jansa <[email protected]>--- meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb | 3 +++ 1 file changed, 3 insertions(+)(quoted diff) +0
-0b/meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb
meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb require oprofile.inc · line 7
Quoted 10 lines
index
1dc535ed8d..8d706e4a50100644meta-oe/recipes-kernel/oprofile/oprofile_1.3.0.bb +2
-0@@ -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
Re: [meta-oe][warrior][PATCH 03/11] oprofile: make MACHINE_ARCH
Quoted 5 lines · Martin Jansa
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
Signature · 4 lines
"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 SeedPATCH 4/11 umip: make MACHINE_ARCH
In reply to Martin Jansa* Depends on ipsec-tools which is already MACHINE_ARCH (and also RRECOMMENDS kernel modules)
* Fixes:
ERROR: umip different signature for task do_configure.sigdata between hammerhead and mako
Hash for dependent task umip/umip_1.0.bb.do_prepare_recipe_sysroot changed from 7c74a208880f6c8a5aa46b1c8577e39b6b71429d9a379ea75f17a155ca270035 to 87c6cd438dd9645c98530e3ac1094005bace785bfd89bfe4073bc8815926abba
Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-networking/recipes-connectivity/umip/umip_1.0.bb.do_prepare_recipe_sysroot with hashes 7c74a208880f6c8a5aa46b1c8577e39b6b71429d9a379ea75f17a155ca270035 or 87c6cd438dd9645c98530e3ac1094005bace785bfd89bfe4073bc8815926abba
bitbake-diffsigs /OE/build/luneos-master/webos-ports/tmp-glibc/sstate-diff/1557963509/[hm]*/*/umip/*do_prepare*.sigdata*
Hash for dependent task ipsec-tools/ipsec-tools_0.8.2.bb.do_populate_sysroot changed from 1100c4984d88050bb7ca154445205bac3c3ab80c3ff0aa7c9124825c9d4f6e14 to feeddbd35a8106b264c98076e21d0b3cb227ab1d209e150926112b2906273ef4
Unable to find matching sigdata for /OE/build/luneos-master/webos-ports/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb.do_populate_sysroot with hashes 1100c4984d88050bb7ca154445205bac3c3ab80c3ff0aa7c9124825c9d4f6e14 or feeddbd35a8106b264c98076e21d0b3cb227ab1d209e150926112b2906273ef4
as detected with: openembedded-core/scripts/sstate-diff-machines.sh --targets=world --tmpdir=tmp-glibc/ --analyze --machines="hammerhead mako qemux86"
--- meta-networking/recipes-connectivity/umip/umip_1.0.bb | 3 +++ 1 file changed, 3 insertions(+)
meta-networking/recipes-connectivity/umip/umip_1.0.bb +3 -0
@@ -20,6 +20,9 @@ SRC_URI = "git://git.umip.org/umip/umip.git \ " SRCREV = "cbd441c5db719db554ff2b4fcb02fef88ae2f791" +# Depends on ipsec-tools which is already MACHINE_ARCH (and also RRECOMMENDS kernel modules) +PACKAGE_ARCH = "${MACHINE_ARCH}" + S = "${WORKDIR}/git" EXTRA_OECONF = "--enable-vt"
Signature · 1 line
2.17.1
PATCH 5/11 mscgen: fix SRC_URI for multilib
In reply to Martin Jansa--- meta-oe/recipes-support/mscgen/mscgen_0.20.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/mscgen/mscgen_0.20.bb +1 -1
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.mcternan.me.uk/mscgen/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b1e6a340187c1cf716513439d07c1d79" -SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${PN}-src-${PV}.tar.gz" +SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377" SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"
Signature · 1 line
2.17.1
PATCH 6/11 triggerhappy: fix issues
In reply to Martin Jansa* using PN instead of BPN in S causes all tasks to fail:
make: *** No targets specified and no makefile found. Stop.
* using github archives is bad, because they are regenerated from time to time with different checksums
* set PV, because this isn't exactly 0.5.0, because of the debian changes mostly the systemd support
* fix indentation
---
...ggerhappy_0.5.0.bb => triggerhappy_git.bb} | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
rename meta-oe/recipes-extended/triggerhappy/{triggerhappy_0.5.0.bb => triggerhappy_git.bb} (73%)meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb renamed from meta-oe/recipes-extended/triggerhappy/triggerhappy_0.5.0.bb +11 -11
@@ -4,12 +4,12 @@ HOMEPAGE = "https://github.com/wertarbyte/triggerhappy" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "https://github.com/wertarbyte/triggerhappy/archive/debian/0.5.0-1.tar.gz" +# matches debian/0.5.0-1 tag +SRCREV = "44a173195986d0d853316cb02a58785ded66c12b" +PV = "0.5.0+git${SRCPV}" +SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian" -SRC_URI[md5sum] = "77f90a18c775e47c4c5e9e08987ca32f" -SRC_URI[sha256sum] = "9150bafbf7f2de7d57e6cc154676c33da98dc11ac6442e1ca57e5dce82bd4292" - -S = "${WORKDIR}/${PN}-debian-${PV}-1" +S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig update-rc.d systemd
@@ -21,12 +21,12 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE_${PN} = "triggerhappy.service triggerhappy.socket" FILES_${PN} = "\ -${sbindir}/thd \ -${sbindir}/th-cmd \ -${sysconfdir}/triggerhappy/triggers.d \ -${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules \ -${sysconfdir}/init.d/triggerhappy \ -${systemd_unitdir}/system \ + ${sbindir}/thd \ + ${sbindir}/th-cmd \ + ${sysconfdir}/triggerhappy/triggers.d \ + ${nonarch_base_libdir}/udev/rules.d/80-triggerhappy.rules \ + ${sysconfdir}/init.d/triggerhappy \ + ${systemd_unitdir}/system \ " CONFFILES_${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules"
Signature · 1 line
2.17.1
PATCH 7/11 python-cassandra-driver.inc: fix DEPENDS
In reply to Martin Jansa* there is no such thing as DEPENDS_${PN}
--- meta-python/recipes-devtools/python/python-cassandra-driver.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python-cassandra-driver.inc +1 -1
@@ -28,6 +28,6 @@ RDEPENDS_${PN} += "\ libevent \ " -DEPENDS_${PN} += "\ +DEPENDS += "\ ${PYTHON_PN}-cython \ "
Signature · 1 line
2.17.1
PATCH 8/11 opencv: use the same package name in PACKAGES and RDEPENDS
In reply to Martin Jansa--- meta-oe/recipes-support/opencv/opencv_3.4.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/opencv/opencv_3.4.5.bb +1 -1
@@ -176,7 +176,7 @@ SUMMARY_python3-opencv = "Python bindings to opencv" FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS_python3-opencv = "python3-core python3-numpy" -RDEPENDS_opencv-apps = "bash" +RDEPENDS_${PN}-apps = "bash" do_install_append() { cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
Signature · 1 line
2.17.1
PATCH 9/11 igmpproxy: remove 0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch and _GNU_SOURCE
In reply to Martin Jansa* it was upgraded to 0.2.1 in:
commit 50979151e69e5707580b2f3d263a9b36b6a190d5
Author: Oleksandr Kravchuk <[email protected]>
Date: Sat Mar 16 18:22:59 2019 +0100
igmpproxy: update to 0.2.1
* which includes _GNU_SOURCE:
https://github.com/pali/igmpproxy/commit/7d790aa2f16afad63418e573db13ea39d76ed141
* and includes sys/types.h in os-linux.h:
https://github.com/pali/igmpproxy/commit/6f92242b23178e979f4a806abe4ac9652b51c593
* and the patch doesn't apply cleanly:
ERROR: Fuzz detected:
checking file src/igmpproxy.h
Hunk #1 succeeded at 51 with fuzz 2 (offset 5 lines).
patching file src/igmpproxy.h
Hunk #1 succeeded at 51 with fuzz 2 (offset 5 lines).
The context lines in the patches can be updated with devtool:
devtool modify lib32-igmpproxy
devtool finish --force-patch-refresh lib32-igmpproxy <layer_path>
Don't forget to review changes done by devtool!
ERROR: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]
--- ...Include-sys-types.h-for-u_short-u_in.patch | 25 ------------------- .../igmpproxy/igmpproxy_0.2.1.bb | 6 +---- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch
meta-networking/recipes-daemons/igmpproxy/igmpproxy/0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From a557651a08e21e3c7c7f5eca9f5405f86624903f Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Fri, 14 Jul 2017 22:42:51 -0700 -Subject: [PATCH] src/igmpproxy.h: Include sys/types.h for u_short/u_init - -Signed-off-by: Khem Raj <[email protected]> ---- - src/igmpproxy.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/igmpproxy.h b/src/igmpproxy.h -index 4dabd1c..4454729 100644 ---- a/src/igmpproxy.h -+++ b/src/igmpproxy.h -@@ -46,6 +46,7 @@ - #include <stdbool.h> - - #include <sys/socket.h> -+#include <sys/types.h> - #include <sys/un.h> - #include <sys/time.h> - #include <sys/ioctl.h> --- -2.13.3 -
meta-networking/recipes-daemons/igmpproxy/igmpproxy_0.2.1.bb +1 -5
@@ -4,12 +4,8 @@ HOMEPAGE = "http://sourceforge.net/projects/igmpproxy/" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=432040ff3a55670c1dec0c32b209ad69" -SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/igmpproxy-${PV}.tar.gz \ - file://0001-src-igmpproxy.h-Include-sys-types.h-for-u_short-u_in.patch \ -" +SRC_URI = "https://github.com/pali/igmpproxy/releases/download/${PV}/${BP}.tar.gz" SRC_URI[md5sum] = "3a9c2cb42c1f5ee0cb769a4884545641" SRC_URI[sha256sum] = "d351e623037390f575c1203d9cbb7ba33a8bdef85a3c5e1d2901c5a2a38449a1" inherit autotools pkgconfig - -CFLAGS += "-D_GNU_SOURCE"
Signature · 1 line
2.17.1
PATCH 10/11 libvncserver: set PV in the recipe
In reply to Martin Jansa* last SRCREV bump commit says:
libvncserver: Update to latest commit post 0.9.12 but there is no PV in the recipe, so the version was just:
git-r0
--- meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/libvncserver/libvncserver_git.bb +1 -1
@@ -32,6 +32,6 @@ inherit cmake SRC_URI = "git://github.com/LibVNC/libvncserver" SRCREV = "c0a23857a5c42b45b6d22ccf7218becd1fa69402" - +PV = "0.9.12+git${SRCPV}" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 11/11 ccid: fix SRC_URI
In reply to Martin Jansa* alioth.debian.org isn't available anymore
* master already has this (was part of the upgrade to newer version)
--- meta-oe/recipes-support/ccid/ccid_1.4.24.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/ccid/ccid_1.4.24.bb +2 -2
@@ -1,12 +1,12 @@ SUMMARY = "Generic USB CCID smart card reader driver" -HOMEPAGE = "http://pcsclite.alioth.debian.org/ccid.html" +HOMEPAGE = "https://ccid.apdu.fr/" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "virtual/libusb0 pcsc-lite" RDEPENDS_${PN} = "pcsc-lite" -SRC_URI = "https://alioth.debian.org/frs/download.php/file/4171/ccid-${PV}.tar.bz2 \ +SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://no-dep-on-libfl.patch \ "
Signature · 1 line
2.17.1
Quoted 6 lines · Martin Jansa
* fixes:
ERROR: Nothing PROVIDES 'gtk+' (but /OE/build/luneos-warrior/webos-ports/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb DEPENDS on or otherwise requires it) gtk+ was skipped: one of 'x11 directfb' needs to be inDISTRO_FEATURES
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'gtkwave', 'gtk+']
Quoted 8 lines
and
ERROR: Nothing PROVIDES 'tk' (but /OE/build/luneos-warrior/webos-ports/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb DEPENDS on or otherwise requires it) tk was skipped: missing required distro feature 'x11' (not in
DISTRO_FEATURES)
ERROR: Required build target 'meta-world-pkgdata' has no buildable providers.
Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'gtkwave', 'tk']Signed-off-by Martin Jansa <[email protected]>
Is Master affected ?
Quoted 19 lines
--- meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 4 ++++ 1 file changed, 4 insertions(+)meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +4
-0@@ -14,6 +14,10 @@ inherit pkgconfig autotools gettext texinfo DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" RDEPENDS_${PN} = "tk-lib" +# depends on gtk+ which has this restriction +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS}" FILES_${PN} = "${bindir} ${datadir}"
All of these are already merged in master, in this case:
http://git.openembedded.org/meta-openembedded/commit/?id=d7dd6476d1820f383aba6ada291c5a3eec7e813f
Quoted 52 lines · On Tue, Jun 11, 2019 at 7:28 PM akuster808 <[email protected]> wrote:
Quoted 2 lines · Martin Jansa
* fixes:
ERROR: Nothing PROVIDES 'gtk+' (but/OE/build/luneos-warrior/webos-ports/meta-openembedded/meta-oe/recipes-graphics/gtkwave/ gtkwave_3.3.98.bb DEPENDS on or otherwise requires it)
Quoted 2 lines
gtk+ was skipped: one of 'x11 directfb' needs to be in
DISTRO_FEATURES
ERROR: Required build target 'meta-world-pkgdata' has no buildableproviders.
Quoted 1 line
Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
'gtkwave', 'gtk+']
Quoted 4 lines
and
ERROR: Nothing PROVIDES 'tk' (but
/OE/build/luneos-warrior/webos-ports/meta-openembedded/meta-oe/recipes-graphics/gtkwave/ gtkwave_3.3.98.bb DEPENDS on or otherwise requires it)
Quoted 1 line
tk was skipped: missing required distro feature 'x11' (not in
DISTRO_FEATURES)Quoted 1 line
ERROR: Required build target 'meta-world-pkgdata' has no buildable
providers.
Quoted 1 line
Missing or unbuildable dependency chain was: ['meta-world-pkgdata',
'gtkwave', 'tk']
Quoted 2 lines
Signed-off-by Martin Jansa <[email protected]>Is Master affected ?
Review
Quoted 5 lines
--- meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb | 4 ++++ 1 file changed, 4 insertions(+)(quoted diff) +0
-0b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb
meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb inherit pkgconfig autotools gettext texinfo · line 14
Quoted 5 lines
index
60df6f773b..b9aae0f6c8100644meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +0
-0@@ -14,6 +14,10 @@ inherit pkgconfig autotools gettext texinfo DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbufglib-2.0"
meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb inherit pkgconfig autotools gettext texinfo
Quoted 7 lines
meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +4
-0RDEPENDS_${PN} = "tk-lib" +# depends on gtk+ which has this restriction +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS}--with-tk=${STAGING_BINDIR_CROSS}"
Quoted 2 lines
meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.98.bb +0
-0FILES_${PN} = "${bindir} ${datadir}"