libsecret: inherit features_check
PATCH 1/2 libsecret: inherit features_check
* otherwise REQUIRED_DISTRO_FEATURES doesn't do anything
--- meta/recipes-gnome/libsecret/libsecret_0.20.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-gnome/libsecret/libsecret_0.20.3.bb +1 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-doc vala gobject-introspection manpages +inherit gnomebase gtk-doc vala gobject-introspection manpages features_check DEPENDS += "glib-2.0 libgcrypt gettext-native"
Signature · 1 line
2.25.1
PATCH 2/2 webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled
* gobject-introspection is mandatory since libsecret upgrade to 0.20.3
* enable libsecret in webkitgtk only when gobject-introspection-data is in DISTRO_FEATURES
* drop comment about libsecret being in meta-gnome from pinentry
--- meta/recipes-sato/webkit/webkitgtk_2.28.2.bb | 10 ++++++---- meta/recipes-support/pinentry/pinentry_1.1.0.bb | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.28.2.bb +6 -4
@@ -26,7 +26,9 @@ SRC_URI[sha256sum] = "b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc6 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)} \ +" CVE_PRODUCT = "webkitgtk webkitgtk\+"
@@ -39,10 +41,10 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libgcrypt \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '' ,d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'webgl opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'webgl gles2', d)} \ enchant \ - libsecret \ + ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'libsecret', '', d)} \ " PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_TARGET=ON,-DENABLE_WAYLAND_TARGET=OFF,wayland libwpe wpebackend-fdo wayland-native"
meta/recipes-support/pinentry/pinentry_1.1.0.bb +3 -3
@@ -19,7 +19,9 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "3829315cb0a1e9cedc05ffe6def7a2c6" SRC_URI[sha256sum] = "68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570" -inherit autotools pkgconfig +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'libsecret', 'gobject-introspection-data', '', d)}" PACKAGECONFIG ??= "ncurses libcap"
@@ -27,8 +29,6 @@ PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qtbase-native qtbase" PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" - -#To use libsecret, add meta-gnome PACKAGECONFIG[secret] = "--enable-libsecret, --disable-libsecret, libsecret" EXTRA_OECONF = " \
Signature · 1 line
2.25.1
✗ patchtest: failure for "libsecret: inherit features_ch..." and 1 more
In reply to Martin Jansa== Series Details ==
Series: "libsecret: inherit features_ch..." and 1 more
Revision: 1
URL : https://patchwork.openembedded.org/series/24179/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:
* Patch [2/2] webkitgtk, pinentry: require gobject-introspection-data in DISTRO_FEATURES when libsecret PACKAGECONFIG is enabled Issue Commit shortlog is too long [test_shortlog_length] Suggested fix Edit shortlog so that it is 90 characters or less (currently 114 characters)
If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe