summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-09-03 15:09:03 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-03 11:09:05 +0100
commit62fdd44972a3b03995dfb1ede7b30025b444b950 (patch)
treecc1938b42b309e274a6bd4d2ddb7bcfdd337b82c /meta/recipes-bsp
parente3088a7608073be26edc56f94da39f885f5ab0d4 (diff)
downloadpoky-62fdd44972a3b03995dfb1ede7b30025b444b950.tar.gz
keymaps: fix for systemd
Only install 'keymap.sh' script if 'sysvinit' is in DISTRO_FEATURES. This is because systemd internally provides a mechanism to implement the functionality this script tries to implement. Please see systemd-vconsole-setup.service for more details. Also we set 'INHIBIT_UPDATERCD_BBCLASS' to "1" if 'sysvinit' is not in DISTRO_FEATURES. (From OE-Core rev: 5e0aa114241b956f61cf852e1f4ff41b576adff4) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/keymaps/keymaps_1.0.bb17
1 files changed, 15 insertions, 2 deletions
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 123db3e0f2..5a3f97434c 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -14,6 +14,13 @@ PR = "r31"
14 14
15INHIBIT_DEFAULT_DEPS = "1" 15INHIBIT_DEFAULT_DEPS = "1"
16 16
17# As the recipe doesn't inherit systemd.bbclass, we need to set this variable
18# manually to avoid unnecessary postinst/preinst generated.
19python __anonymous() {
20 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
21 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
22}
23
17inherit update-rc.d 24inherit update-rc.d
18 25
19SRC_URI = "file://keymap.sh \ 26SRC_URI = "file://keymap.sh \
@@ -23,6 +30,12 @@ INITSCRIPT_NAME = "keymap.sh"
23INITSCRIPT_PARAMS = "start 01 S ." 30INITSCRIPT_PARAMS = "start 01 S ."
24 31
25do_install () { 32do_install () {
26 install -d ${D}${sysconfdir}/init.d/ 33 # Only install the script if 'sysvinit' is in DISTRO_FEATURES
27 install -m 0755 ${WORKDIR}/keymap.sh ${D}${sysconfdir}/init.d/ 34 # THe ulitity this script provides could be achieved by systemd-vconsole-setup.service
35 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
36 install -d ${D}${sysconfdir}/init.d/
37 install -m 0755 ${WORKDIR}/keymap.sh ${D}${sysconfdir}/init.d/
38 fi
28} 39}
40
41ALLOW_EMPTY_${PN} = "1"