Skip to contentSkip to conversation

systemd: Make libnss-mymachines conditional upon packageconfig

PATCH Superseded Khem Raj 2 participants 2 messages Nov 6, 2023

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 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]

Cc Florian Wickert <[email protected]>
---
 meta/recipes-core/systemd/systemd_254.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_254.4.bb +1 -1
index 8a8ff545995..f22e5bfd059 100644
@@ -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 += "\
Signature · 1 line
2.42.1
#1 lore raw

Khem Raj <[email protected]> escreveu no dia segunda, 6/11/2023 à(s) 17:09:

Quoted 21 lines

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]

Cc Florian Wickert <[email protected]>
---
 meta/recipes-core/systemd/systemd_254.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_254.4.bb +0 -0
index 8a8ff545995..f22e5bfd059 100644
@@ -542,7 +542,7 @@ FILES:${PN}-container =

"${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c

Quoted 7 lines
${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)}"

extra $ nitpick.

Quoted 19 lines

# "machinectl import-tar" uses "tar --numeric-owner", not supported by
busybox.
RRECOMMENDS:${PN}-container += "\
--
2.42.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#190239):
https://lists.openembedded.org/g/openembedded-core/message/190239
Mute This Topic: https://lists.openembedded.org/mt/102424819/5052612
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Best regards,

José Quaresma