]> code.ossystems Code Review - openembedded-core.git/commitdiff
sysvinit: inherit distro_features_check
authorRobert Yang <liezhi.yang@windriver.com>
Wed, 20 Dec 2017 01:53:12 +0000 (09:53 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 4 Jan 2018 12:56:03 +0000 (12:56 +0000)
Use distro_features_check so that we can have a uniform controller.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb

index 22a0ecf83966a6a1d2d89c2daa472f40dd55b37e..ad65819b2de03fb0e6ca5076455ebda93301e4bc 100644 (file)
@@ -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")
-}