diff options
-rw-r--r-- | meta/classes/systemd.bbclass | 4 | ||||
-rw-r--r-- | 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 3700b2eee3..7a8d35cd2f 100644 --- a/meta/classes/systemd.bbclass +++ b/meta/classes/systemd.bbclass | |||
@@ -9,8 +9,8 @@ SYSTEMD_PACKAGES_class-nativesdk ?= "" | |||
9 | SYSTEMD_AUTO_ENABLE ??= "enable" | 9 | SYSTEMD_AUTO_ENABLE ??= "enable" |
10 | 10 | ||
11 | # This class will be included in any recipe that supports systemd init scripts, | 11 | # This class will be included in any recipe that supports systemd init scripts, |
12 | # even if the systemd DISTRO_FEATURE isn't enabled. As such don't make any | 12 | # even if systemd is not in DISTRO_FEATURES. As such don't make any changes |
13 | # changes directly but check the DISTRO_FEATURES first. | 13 | # directly but check the DISTRO_FEATURES first. |
14 | python __anonymous() { | 14 | python __anonymous() { |
15 | features = d.getVar("DISTRO_FEATURES", True).split() | 15 | features = d.getVar("DISTRO_FEATURES", True).split() |
16 | # If the distro features have systemd but not sysvinit, inhibit update-rcd | 16 | # 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 ee716f43e1..8c70fe507c 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 () { | |||
323 | rm -f ${sysconfdir}/udev/hwdb.bin | 323 | rm -f ${sysconfdir}/udev/hwdb.bin |
324 | } | 324 | } |
325 | 325 | ||
326 | # As this recipe builds udev, respect the systemd DISTRO_FEATURE so we don't try | 326 | # As this recipe builds udev, respect systemd being in DISTRO_FEATURES so |
327 | # building udev and systemd in world builds. | 327 | # that we don't build both udev and systemd in world builds. |
328 | python () { | 328 | python () { |
329 | if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): | 329 | if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): |
330 | raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") | 330 | raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") |