diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-12-20 09:53:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-04 12:57:43 +0000 |
commit | a8f78241be9b30a3ff851713f0b8fae97acee464 (patch) | |
tree | e6086c024a8547b58460abd9ad6993e34b46d763 | |
parent | a1cc0e3d6eb960f2578e8ac0a0884fbf1c6c807c (diff) | |
download | poky-a8f78241be9b30a3ff851713f0b8fae97acee464.tar.gz |
sysvinit: inherit distro_features_check
Use distro_features_check so that we can have a uniform controller.
(From OE-Core rev: 658c59c90092f15c026fa3c72399f481c7241f65)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 9 |
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 | |||
28 | S = "${WORKDIR}/sysvinit-${PV}" | 28 | S = "${WORKDIR}/sysvinit-${PV}" |
29 | B = "${S}/src" | 29 | B = "${S}/src" |
30 | 30 | ||
31 | inherit update-alternatives | 31 | inherit update-alternatives distro_features_check |
32 | DEPENDS_append = " update-rc.d-native base-passwd" | 32 | DEPENDS_append = " update-rc.d-native base-passwd" |
33 | 33 | ||
34 | REQUIRED_DISTRO_FEATURES = "sysvinit" | ||
35 | |||
34 | ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" | 36 | ALTERNATIVE_${PN} = "init mountpoint halt reboot runlevel shutdown poweroff last lastb mesg utmpdump wall" |
35 | 37 | ||
36 | ALTERNATIVE_PRIORITY = "200" | 38 | ALTERNATIVE_PRIORITY = "200" |
@@ -105,8 +107,3 @@ do_install () { | |||
105 | chown root.shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown | 107 | chown root.shutdown ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown |
106 | chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown | 108 | chmod o-x,u+s ${D}${base_sbindir}/halt ${D}${base_sbindir}/shutdown |
107 | } | 109 | } |
108 | |||
109 | python () { | ||
110 | if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): | ||
111 | raise bb.parse.SkipPackage("'sysvinit' not in DISTRO_FEATURES") | ||
112 | } | ||