From 40b37ec0f653c9ba9bba22c2923c4ed28f3c2ec7 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 13 Nov 2013 14:32:46 +0000 Subject: [PATCH] systemd: fix comments It's DISTRO_FEATURES; DISTRO_FEATURE is invalid. (From OE-Core rev: d2380c683d5411e7a85c3ce80115aea329187534) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/classes/systemd.bbclass | 4 ++-- meta/recipes-core/systemd/systemd_208.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass index 3700b2e..7a8d35c 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass @@ -9,8 +9,8 @@ SYSTEMD_PACKAGES_class-nativesdk ?= "" SYSTEMD_AUTO_ENABLE ??= "enable" # This class will be included in any recipe that supports systemd init scripts, -# even if the systemd DISTRO_FEATURE isn't enabled. As such don't make any -# changes directly but check the DISTRO_FEATURES first. +# even if systemd is not in DISTRO_FEATURES. As such don't make any changes +# directly but check the DISTRO_FEATURES first. python __anonymous() { features = d.getVar("DISTRO_FEATURES", True).split() # If the distro features have systemd but not sysvinit, inhibit update-rcd diff --git a/meta/recipes-core/systemd/systemd_208.bb b/meta/recipes-core/systemd/systemd_208.bb index ee716f4..8c70fe5 100644 --- a/meta/recipes-core/systemd/systemd_208.bb +++ b/meta/recipes-core/systemd/systemd_208.bb @@ -323,8 +323,8 @@ pkg_prerm_udev-hwdb () { rm -f ${sysconfdir}/udev/hwdb.bin } -# As this recipe builds udev, respect the systemd DISTRO_FEATURE so we don't try -# building udev and systemd in world builds. +# 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 oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") -- 2.7.4