summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dbus/dbus.inc2
-rw-r--r--meta/recipes-core/systemd/systemd-serialgetty.bb2
-rw-r--r--meta/recipes-core/systemd/systemd_211.bb4
-rw-r--r--meta/recipes-core/udev/udev.inc2
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 5727ae77b2..8d348f8f25 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -25,7 +25,7 @@ INITSCRIPT_NAME = "dbus-1"
25INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." 25INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
26 26
27python __anonymous() { 27python __anonymous() {
28 if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 28 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
29 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") 29 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
30} 30}
31 31
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb
index 13b2dbacec..1c34d5c747 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta/recipes-core/systemd/systemd-serialgetty.bb
@@ -44,6 +44,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
44 44
45# As this package is tied to systemd, only build it when we're also building systemd. 45# As this package is tied to systemd, only build it when we're also building systemd.
46python () { 46python () {
47 if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): 47 if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
48 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") 48 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
49} 49}
diff --git a/meta/recipes-core/systemd/systemd_211.bb b/meta/recipes-core/systemd/systemd_211.bb
index 44b196538a..278de9fd56 100644
--- a/meta/recipes-core/systemd/systemd_211.bb
+++ b/meta/recipes-core/systemd/systemd_211.bb
@@ -295,7 +295,7 @@ INITSCRIPT_NAME_udev = "systemd-udevd"
295INITSCRIPT_PARAMS_udev = "start 03 S ." 295INITSCRIPT_PARAMS_udev = "start 03 S ."
296 296
297python __anonymous() { 297python __anonymous() {
298 if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 298 if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
299 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") 299 d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
300} 300}
301 301
@@ -348,6 +348,6 @@ pkg_prerm_udev-hwdb () {
348# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so 348# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so
349# that we don't build both udev and systemd in world builds. 349# that we don't build both udev and systemd in world builds.
350python () { 350python () {
351 if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): 351 if not bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
352 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES") 352 raise bb.parse.SkipPackage("'systemd' not in DISTRO_FEATURES")
353} 353}
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 1b22525436..f9d544e86a 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -99,7 +99,7 @@ do_install_append () {
99 99
100# As systemd also builds udev, skip this package if we're doing a systemd build. 100# As systemd also builds udev, skip this package if we're doing a systemd build.
101python () { 101python () {
102 if oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): 102 if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
103 raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES") 103 raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
104} 104}
105do_compile_ptest() { 105do_compile_ptest() {