| Message ID | 20260710125425.220975-5-ross.burton@arm.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [1/5] systemd: move systemd-systemctl-native PACKAGE_WRITE_DEPS to systemd.bb | expand |
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index fb7b09393a..89ef8bd600 100644 --- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb @@ -18,13 +18,3 @@ do_install () { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${S}/modutils.sh ${D}${sysconfdir}/init.d/ } - -PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst:${PN} () { - if type systemctl >/dev/null 2>/dev/null; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask modutils.service - fi -}
systemd no longer has sysvinit compatibility[1], so it won't try and run the init script in this recipe that is also implemented by systemd. Remove the explicit systemd unit masking, effectively reverting [2]. [1] oe-core d9ec9e20eeb ("systemd: Stop supporting sysvinit compatibility") [2] oe-core 8fc304a59b ("modutils-initscripts: mask modutils in case of systemd") Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../modutils-initscripts/modutils-initscripts.bb | 10 ---------- 1 file changed, 10 deletions(-)