[OE-core] [PATCH 2/2] systemd: inherit distro_features_check

[Andre McCurdy]

On Wed, Dec 20, 2017 at 1:53 PM, Andre McCurdy <armccurdy at gmail.com> wrote:
> On Tue, Dec 19, 2017 at 5:53 PM, Robert Yang <liezhi.yang at windriver.com> wrote:
>> Use distro_features_check so that we can have a uniform controller.
>>
>> Signed-off-by: Robert Yang <liezhi.yang at 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"