From b200b4ce97c513af94517d6f4f4ee8c1a7ef66a8 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 27 Aug 2014 22:00:46 -0400 Subject: keymaps: mask keymap when necessary When 'sysvinit' and 'systemd' are both in DISTRO_FEATURES, we need to prevent the init script from running via systemd. This is because that the functionality of the init script has implemented in systemd internally. Signed-off-by: Chen Qi --- meta/recipes-bsp/keymaps/keymaps_1.0.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb index a3f2d89b26..925161b5d2 100644 --- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb +++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb @@ -35,4 +35,14 @@ do_install () { fi } +DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','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" -- cgit 1.2.3-korg