[oe-commits] Chen Qi : v86d: mask fbsetup when necessary

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 0122406a75e982a72d9a6363a9ca7f187b13935a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0122406a75e982a72d9a6363a9ca7f187b13935a

Author: Chen Qi <Qi.Chen at windriver.com>
Date:   Tue Sep  2 18:54:08 2014 +0800

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.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-bsp/v86d/v86d_0.1.10.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/meta/recipes-bsp/v86d/v86d_0.1.10.bb
index 7ccb4ee..f502072 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() {
 }
 
 inherit update-rc.d
+
+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 fbsetup.service
+	fi
+}