diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-09-03 15:09:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-03 11:09:06 +0100 |
commit | 2caee0c68aa438c21aaf514428a0ada771757b58 (patch) | |
tree | 89c7ba6c5d642b988db1295b797322417a65e0b6 | |
parent | c57427b4a7991e33b806d4fd0956b6010ed52f62 (diff) | |
download | poky-2caee0c68aa438c21aaf514428a0ada771757b58.tar.gz |
v86d: mask fbsetup 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 has been implemented internally
in systemd.
(From OE-Core rev: 2236678e38b22b763de8322d90585cbf648a448c)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/v86d/v86d_0.1.10.bb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/meta/recipes-bsp/v86d/v86d_0.1.10.bb index 7ccb4ee30f..f50207212f 100644 --- a/meta/recipes-bsp/v86d/v86d_0.1.10.bb +++ b/meta/recipes-bsp/v86d/v86d_0.1.10.bb | |||
@@ -57,3 +57,13 @@ python __anonymous() { | |||
57 | } | 57 | } |
58 | 58 | ||
59 | inherit update-rc.d | 59 | inherit update-rc.d |
60 | |||
61 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | ||
62 | pkg_postinst_${PN} () { | ||
63 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then | ||
64 | if [ -n "$D" ]; then | ||
65 | OPTS="--root=$D" | ||
66 | fi | ||
67 | systemctl $OPTS mask fbsetup.service | ||
68 | fi | ||
69 | } | ||