summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-12-19 16:23:40 +0800
committerRobert Yang <liezhi.yang@windriver.com>2017-12-20 09:51:33 +0800
commit8321b1389864798845fb943888e43a89c60a8d4c (patch)
tree6e56fc06379d24a7b6aaac1561f880c909ad473c
parent978472c58629d1448399207873bbead96b27102e (diff)
downloadopenembedded-core-contrib-8321b1389864798845fb943888e43a89c60a8d4c.tar.gz
openembedded-core-contrib-8321b1389864798845fb943888e43a89c60a8d4c.tar.bz2
openembedded-core-contrib-8321b1389864798845fb943888e43a89c60a8d4c.zip
sysvinit: inherit distro_features_check
Use distro_features_check so that we can have a uniform controller. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb9
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index 22a0ecf839..ad65819b2d 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -28,9 +28,11 @@ SRC_URI[sha256sum] = "60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5
S = "${WORKDIR}/sysvinit-${PV}"
B = "${S}/src"
-inherit update-alternatives
+inherit update-alternatives distro_features_check
DEPENDS_append = " update-rc.d-native base-passwd"
+REQUIRED_DISTRO_FEATURES = "sysvinit"
+
ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall"
ALTERNATIVE_PRIORITY = "200"
@@ -105,8 +107,3 @@ do_install () {
chown root.shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown
chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown
}
-
-python () {
- if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
- raise bb.parse.SkipPackage("'sysvinit' not in DISTRO_FEATURES")
-}