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 8cfba07e24 ("keymaps: mask keymap when necessary")
Signed-off-by: Ross Burton <[email protected]>
---
meta/recipes-bsp/keymaps/keymaps_1.0.bb | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index b7e6ef6cb1..546ebba5dc 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -11,13 +11,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
INHIBIT_DEFAULT_DEPS = "1"
-# As the recipe doesn't inherit systemd.bbclass, we need to set this variable
-# manually to avoid unnecessary postinst/preinst generated.
-python __anonymous() {
- if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
- d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
-}
-
inherit update-rc.d
SRC_URI = "file://keymap.sh"
@@ -36,14 +29,4 @@ do_install () {
fi
}
-PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd
sysvinit','systemd-systemctl-native','',d)}"
-pkg_postinst:${PN} () {
- if ${@bb.utils.contains('DISTRO_FEATURES','systemd
sysvinit','true','false',d)}; then
- if [ -n "$D" ]; then
- OPTS="--root=$D"
- fi
- systemctl $OPTS mask keymap.service
- fi
-}
-
ALLOW_EMPTY:${PN} = "1"
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#240637):
https://lists.openembedded.org/g/openembedded-core/message/240637
Mute This Topic: https://lists.openembedded.org/mt/120205952/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
