[PATCH 0/2] sysvinit/systemd: inherit distro_features_check

[PATCH 0/2] sysvinit/systemd: inherit distro_features_check

[Robert Yang]

The following changes since commit 978472c58629d1448399207873bbead96b27102e:

  image.bbclass: Add additional bb.debug to help track 12304 (2017-12-18 18:02:12 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/systemd
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/systemd

Robert Yang (2):
  sysvinit: inherit distro_features_check
  systemd: inherit distro_features_check

 meta/recipes-core/systemd/systemd-serialgetty.bb | 10 ++++------
 meta/recipes-core/systemd/systemd_234.bb         | 13 +++++--------
 meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb   |  9 +++------
 meta/recipes-core/udev/eudev_3.2.2.bb            |  9 +++------
 4 files changed, 15 insertions(+), 26 deletions(-)

-- 
2.7.4

[PATCH 1/2] sysvinit: inherit distro_features_check

[Robert Yang]

Use distro_features_check so that we can have a uniform controller.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 9 +++------
 1 file 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 22a0ecf..ad65819 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")
-}
-- 
2.7.4

[PATCH 2/2] systemd: inherit distro_features_check

[Robert Yang]

Use distro_features_check so that we can have a uniform controller.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-core/systemd/systemd-serialgetty.bb | 10 ++++------
 meta/recipes-core/systemd/systemd_234.bb         | 13 +++++--------
 meta/recipes-core/udev/eudev_3.2.2.bb            |  9 +++------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
index d934716..d67a3c9 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -11,6 +11,10 @@ SRC_URI = "file://serial-getty@.service"
 
 S = "${WORKDIR}"
 
+# As this package is tied to systemd, only build it when we're also building systemd.
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES = "systemd"
+
 do_install() {
 	if [ ! -z "${SERIAL_CONSOLES}" ] ; then
 		default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'`
@@ -43,10 +47,4 @@ do_install() {
 FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# As this package is tied to systemd, only build it when we're also building systemd.
-python () {
-    if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
-        raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
-}
-
 ALLOW_EMPTY_${PN} = "1"
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 778b868..58426ca 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -8,7 +8,11 @@ DEPENDS = "kmod intltool-native gperf-native acl readline libcap libcgroup util-
 
 SECTION = "base/shell"
 
-inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion manpages
+inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext bash-completion manpages distro_features_check
+
+# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so
+# that we don't build both udev and systemd in world builds.
+REQUIRED_DISTRO_FEATURES = "systemd"
 
 SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
            file://touchscreen.rules \
@@ -633,10 +637,3 @@ pkg_postinst_udev-hwdb () {
 pkg_prerm_udev-hwdb () {
 	rm -f $D${sysconfdir}/udev/hwdb.bin
 }
-
-# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so
-# that we don't build both udev and systemd in world builds.
-python () {
-    if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
-        raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
-}
diff --git a/meta/recipes-core/udev/eudev_3.2.2.bb b/meta/recipes-core/udev/eudev_3.2.2.bb
index 70e3568..d011047 100644
--- a/meta/recipes-core/udev/eudev_3.2.2.bb
+++ b/meta/recipes-core/udev/eudev_3.2.2.bb
@@ -23,7 +23,9 @@ SRC_URI = "http://dev.gentoo.org/~blueness/${BPN}/${BP}.tar.gz \
 SRC_URI[md5sum] = "41e19b70462692fefd072a3f38818b6e"
 SRC_URI[sha256sum] = "3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63"
 
-inherit autotools update-rc.d qemu pkgconfig
+inherit autotools update-rc.d qemu pkgconfig distro_features_check
+
+CONFLICT_DISTRO_FEATURES = "systemd"
 
 EXTRA_OECONF = " \
     --sbindir=${base_sbindir} \
@@ -75,11 +77,6 @@ RDEPENDS_eudev-hwdb += "eudev"
 RPROVIDES_${PN} = "hotplug udev"
 RPROVIDES_eudev-hwdb += "udev-hwdb"
 
-python () {
-    if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
-        raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
-}
-
 PACKAGE_WRITE_DEPS += "qemu-native"
 pkg_postinst_eudev-hwdb () {
     if test -n "$D"; then
-- 
2.7.4

Re: [PATCH 2/2] systemd: inherit distro_features_check

[Andre McCurdy]

On Tue, Dec 19, 2017 at 5:53 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
> Use distro_features_check so that we can have a uniform controller.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  meta/recipes-core/systemd/systemd-serialgetty.bb | 10 ++++------
>  meta/recipes-core/systemd/systemd_234.bb         | 13 +++++--------
>  meta/recipes-core/udev/eudev_3.2.2.bb            |  9 +++------
>  3 files changed, 12 insertions(+), 20 deletions(-)
>
> diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
> index d934716..d67a3c9 100644
> --- a/meta/recipes-core/systemd/systemd-serialgetty.bb
> +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
> @@ -11,6 +11,10 @@ SRC_URI = "file://serial-getty@.service"
>
>  S = "${WORKDIR}"
>
> +# As this package is tied to systemd, only build it when we're also building systemd.
> +inherit distro_features_check
> +REQUIRED_DISTRO_FEATURES = "systemd"
> +

"inherit distro_features_check" needs to be added too.

>  do_install() {
>         if [ ! -z "${SERIAL_CONSOLES}" ] ; then
>                 default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'`
> @@ -43,10 +47,4 @@ do_install() {
>  FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}"
>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> -# As this package is tied to systemd, only build it when we're also building systemd.
> -python () {
> -    if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
> -        raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
> -}
> -
>  ALLOW_EMPTY_${PN} = "1"

Re: [PATCH 2/2] systemd: inherit distro_features_check

[Andre McCurdy]

On Wed, Dec 20, 2017 at 1:53 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Tue, Dec 19, 2017 at 5:53 PM, Robert Yang <liezhi.yang@windriver.com> wrote:
>> Use distro_features_check so that we can have a uniform controller.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>  meta/recipes-core/systemd/systemd-serialgetty.bb | 10 ++++------
>>  meta/recipes-core/systemd/systemd_234.bb         | 13 +++++--------
>>  meta/recipes-core/udev/eudev_3.2.2.bb            |  9 +++------
>>  3 files changed, 12 insertions(+), 20 deletions(-)
>>
>> diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
>> index d934716..d67a3c9 100644
>> --- a/meta/recipes-core/systemd/systemd-serialgetty.bb
>> +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
>> @@ -11,6 +11,10 @@ SRC_URI = "file://serial-getty@.service"
>>
>>  S = "${WORKDIR}"
>>
>> +# As this package is tied to systemd, only build it when we're also building systemd.
>> +inherit distro_features_check
>> +REQUIRED_DISTRO_FEATURES = "systemd"
>> +
>
> "inherit distro_features_check" needs to be added too.

Oops, sorry. It's right there... I see it now :-)

>>  do_install() {
>>         if [ ! -z "${SERIAL_CONSOLES}" ] ; then
>>                 default_baudrate=`echo "${SERIAL_CONSOLES}" | sed 's/\;.*//'`
>> @@ -43,10 +47,4 @@ do_install() {
>>  FILES_${PN} = "${systemd_unitdir}/system/*.service ${sysconfdir}"
>>  PACKAGE_ARCH = "${MACHINE_ARCH}"
>>
>> -# As this package is tied to systemd, only build it when we're also building systemd.
>> -python () {
>> -    if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
>> -        raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
>> -}
>> -
>>  ALLOW_EMPTY_${PN} = "1"