diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2014-09-03 15:09:17 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-03 11:09:06 +0100 |
| commit | c57427b4a7991e33b806d4fd0956b6010ed52f62 (patch) | |
| tree | 2638c92ffd77420e17804ad9e49ff3444cdb77d7 /meta/recipes-bsp/keymaps | |
| parent | 3b00803dd17a5ae7d9115d4ebb0e38d00751a559 (diff) | |
| download | poky-c57427b4a7991e33b806d4fd0956b6010ed52f62.tar.gz | |
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.
(From OE-Core rev: 8cfba07e24dae3d1837ccb5cb04e11f362519b0a)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/keymaps')
| -rw-r--r-- | meta/recipes-bsp/keymaps/keymaps_1.0.bb | 10 |
1 files changed, 10 insertions, 0 deletions
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 () { | |||
| 35 | fi | 35 | fi |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | ||
| 39 | pkg_postinst_${PN} () { | ||
| 40 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then | ||
| 41 | if [ -n "$D" ]; then | ||
| 42 | OPTS="--root=$D" | ||
| 43 | fi | ||
| 44 | systemctl $OPTS mask keymap.service | ||
| 45 | fi | ||
| 46 | } | ||
| 47 | |||
| 38 | ALLOW_EMPTY_${PN} = "1" | 48 | ALLOW_EMPTY_${PN} = "1" |
