pcsc-lite: install systemd system units
PATCH v4 1/1 pcsc-lite: install systemd system units
From: Wang Mingyu <[email protected]>
pcsc-lite 2.5.0 defaults to installing systemd user units, which leaves the package without a system-level pcscd.service while SYSTEMD_SERVICE still enables pcscd.socket. On target systems this makes systemctl status pcscd fail, and systemctl --user start pcscd can fail because the user unit requires polkit.service from the user manager.
Select upstream Meson systemdunit=system so pcscd.service and pcscd.socket are installed as system units. Keep upstream sysusers.d packaging so systemd-sysusers can create the pcscd system user required by the generated service and socket units.
--- meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.5.1.bb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.5.1.bb +5 -7
@@ -18,6 +18,7 @@ inherit meson systemd pkgconfig perlnative EXTRA_OEMESON = " \ -Dlibusb=false \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemdunit=system', '', d)} \ -Dusbdropdir=${libdir}/pcsc/drivers \ "
@@ -38,7 +39,10 @@ RPROVIDES:${PN}:append:class-native = " pcsc-lite-lib-native" FILES:${PN} = "${sbindir}/pcscd \ ${datadir}/polkit-1 \ - ${nonarch_libdir}/systemd/user \ + ${systemd_system_unitdir}/pcscd.service \ + ${systemd_system_unitdir}/pcscd.socket \ + ${libdir}/sysusers.d \ + ${exec_prefix}/sysusers.d \ ${sysconfdir}/default/pcscd" FILES:${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" FILES:${PN}-dev = "${includedir} \
@@ -54,12 +58,6 @@ FILES:${PN}-spy-dev = "${libdir}/libpcscspy.la \ do_install:append() { rm -rf ${D}${datadir}/metainfo - # pcsc-lite installs pcscd-sysusers.conf into systemd's sysusersdir when - # the systemd pkg-config variable is available (${libdir}/sysusers.d), - # and falls back to ${exec_prefix}/sysusers.d otherwise. Drop both so the - # file is not left unpackaged (installed-vs-shipped QA). - rm -rf ${D}${libdir}/sysusers.d - rm -rf ${D}${exec_prefix}/sysusers.d } RPROVIDES:${PN} += "${PN}-systemd"
Signature · 1 line
2.43.0
Fails on AB again -
https://autobuilder.yoctoproject.org/valkyrie/#/builders/81/builds/1740/steps/17/logs/errors
ERROR: pcsc-lite-2.5.1-r0 do_package: QA Issue: pcsc-lite:
Files/directories were installed but not shipped in any package:
/usr/lib/systemd
/usr/lib/systemd/user
/usr/lib/systemd/user/pcscd.service /usr/lib/systemd/user/pcscd.socket
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
pcsc-lite: 4 installed and not shipped files. [installed-vs-shipped]
Quoted 75 lines · wangmy via lists.openembedded.org
From: Wang Mingyu <[email protected]>
pcsc-lite 2.5.0 defaults to installing systemd user units, which leaves the package without a system-level pcscd.service while
SYSTEMD_SERVICEstill enables pcscd.socket. On target systems this makes systemctl status pcscd fail, and systemctl --user start pcscd can fail because the user unit requires polkit.service from the user manager.Select upstream Meson systemdunit=system so pcscd.service and pcscd.socket are installed as system units. Keep upstream sysusers.d packaging so systemd-sysusers can create the pcscd system user required by the generated service and socket units.
Signed-off-by Wang Mingyu <[email protected]>--- meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.5.1.bb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.5.1.bb +1
-0@@ -18,6 +18,7 @@ inherit meson systemd pkgconfig perlnative EXTRA_OEMESON = " \ -Dlibusb=false \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemdunit=system', '', d)} \ -Dusbdropdir=${libdir}/pcsc/drivers \ "@@ -38,7 +39,10 @@ RPROVIDES:${PN}:append:class-native = "pcsc-lite-lib-native"
FILES:${PN} = "${sbindir}/pcscd \ ${datadir}/polkit-1 \meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.5.1.bb +4
-2- ${nonarch_libdir}/systemd/user \ + ${systemd_system_unitdir}/pcscd.service \ + ${systemd_system_unitdir}/pcscd.socket \ + ${libdir}/sysusers.d \ + ${exec_prefix}/sysusers.d \ ${sysconfdir}/default/pcscd" FILES:${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" FILES:${PN}-dev = "${includedir} \@@ -54,12 +58,6 @@ FILES:${PN}-spy-dev = "${libdir}/libpcscspy.la \ do_install:append() { rm -rf ${D}${datadir}/metainfo - # pcsc-lite installs pcscd-sysusers.conf into systemd's sysusersdirwhen
meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.5.1.bb +0
-2- # the systemd pkg-config variable is available (${libdir}/sysusers.d), - # and falls back to ${exec_prefix}/sysusers.d otherwise. Drop both sothe
meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.5.1.bb +0
-4- # file is not left unpackaged (installed-vs-shipped QA). - rm -rf ${D}${libdir}/sysusers.d - rm -rf ${D}${exec_prefix}/sysusers.d } RPROVIDES:${PN} += "${PN}-systemd" --2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#129394):
https://lists.openembedded.org/g/openembedded-devel/message/129394
Mute This Topic: https://lists.openembedded.org/mt/120855399/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-