systemd: fix libnss-mymachines packaging
PATCH 1/1 systemd: fix libnss-mymachines packaging
By removing libnss_mymachines.so.2 from FILES:${PN}-container it correctly gets packaged into libnss-mymachines, just like the other libnss-* components, due to PACKAGES_DYNAMIC.
To make up for the missing lib in the container package, I added libnss-mymachines to RDEPENDS:${PN}-container. As I understand it, the lib should be installed even without this if anything from the container package links against it. But since I don't know if there was a special reason to explicitly add it to the container files list, like something using dlopen to load the lib, it seemd to be the safest option.
--- meta/recipes-core/systemd/systemd_254.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_254.4.bb +2 -1
@@ -534,7 +534,6 @@ FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ ${exec_prefix}/lib/tmpfiles.d/README \ ${systemd_system_unitdir}/[email protected] \ - ${libdir}/libnss_mymachines.so.2 \ ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \ ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \ ${datadir}/dbus-1/system.d/org.freedesktop.import1.conf \
@@ -543,6 +542,8 @@ 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" + # "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox. RRECOMMENDS:${PN}-container += "\ ${PN}-journal-gatewayd \
Signature · 1 line
2.42.0
Quoted 31 lines · Florian Wickert
By removing libnss_mymachines.so.2 from FILES:${PN}-container it correctly gets packaged into libnss-mymachines, just like the other libnss-* components, due to
PACKAGES_DYNAMIC.To make up for the missing lib in the container package, I added libnss-mymachines to RDEPENDS:${PN}-container. As I understand it, the lib should be installed even without this if anything from the container package links against it. But since I don't know if there was a special reason to explicitly add it to the container files list, like something using dlopen to load the lib, it seemd to be the safest option.
Signed-off-by Florian Wickert <[email protected]>--- meta/recipes-core/systemd/systemd_254.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)meta/recipes-core/systemd/systemd_254.4.bb +0
-1@@ -534,7 +534,6 @@ FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \ ${exec_prefix}/lib/tmpfiles.d/README \ ${systemd_system_unitdir}/[email protected] \ - ${libdir}/libnss_mymachines.so.2 \ ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \ ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \ ${datadir}/dbus-1/system.d/org.freedesktop.import1.conf \
meta/recipes-core/systemd/systemd_254.4.bb FILES:${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c · line 545
Quoted 4 lines
meta/recipes-core/systemd/systemd_254.4.bb +1
-0@@ -543,6 +542,8 @@ 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"
musl based targets do not build libnss-mymachines so please make this dependency only for glibc
Quoted 16 lines
meta/recipes-core/systemd/systemd_254.4.bb +1
-1+ # "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox. RRECOMMENDS:${PN}-container += "\ ${PN}-journal-gatewayd \ --2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190164): https://lists.openembedded.org/g/openembedded-core/message/190164
Mute This Topic: https://lists.openembedded.org/mt/102365438/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-