From: Khem Raj Date: Mon, 6 Nov 2023 17:09:34 +0000 (-0800) Subject: systemd: Make libnss-mymachines conditional upon packageconfig X-Git-Tag: yocto-5.2~4637 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40f2e5776ebf6cf93694d05189488e8448767b3a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git systemd: Make libnss-mymachines conditional upon packageconfig nss-mymachines packageconfig controls this features therefore add this dependency only when it is enabled. Fixes ERROR: systemd-1_254.4-r0 do_package_qa: QA Issue: systemd-container rdepends on libnss-mymachines, but it isn't a build dependency? [build-deps] Signed-off-by: Khem Raj Cc: Florian Wickert Signed-off-by: Alexandre Belloni --- diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb index 8a8ff545995..80ef4187269 100644 --- a/meta/recipes-core/systemd/systemd_254.4.bb +++ b/meta/recipes-core/systemd/systemd_254.4.bb @@ -542,7 +542,7 @@ FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ " -RDEPENDS:${PN}-container = "libnss-mymachines" +RDEPENDS:${PN}-container = "${@bb.utils.contains('PACKAGECONFIG', 'nss-mymachines', 'libnss-mymachines', '', d)}" # "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox. RRECOMMENDS:${PN}-container += "\