From: Chen Qi Date: Wed, 3 Sep 2014 07:09:18 +0000 (+0800) Subject: v86d: mask fbsetup when necessary X-Git-Tag: rev_ivi_2015_02_04~6707 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60b50cadc0fcedd558e69e9bf60ca972bae6aa28;p=scm%2Fbb%2Ftizen-distro.git 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 Signed-off-by: Richard Purdie --- 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 +}