From 658c59c90092f15c026fa3c72399f481c7241f65 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 20 Dec 2017 09:53:12 +0800 Subject: sysvinit: inherit distro_features_check Use distro_features_check so that we can have a uniform controller. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core/sysvinit') 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") -} -- cgit 1.2.3-korg