From 08a38a7865c41ec60f4b993b964f8d477ea0f680 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 24 Apr 2014 15:59:19 -0300 Subject: Globally replace oe.utils.contains to bb.utils.contains BitBake has the exact same code as oe.utils.contains so there's no reason to duplicate it. We now rely on the bb.utils.contains code for metadata. (From OE-Core rev: 93499ebc46547f5bf6dcecd5a786ead9f726de28) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-core/dbus/dbus.inc | 2 +- meta/recipes-core/systemd/systemd-serialgetty.bb | 2 +- meta/recipes-core/systemd/systemd_211.bb | 4 ++-- meta/recipes-core/udev/udev.inc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-core') 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" INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." python __anonymous() { - if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") } 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}" # As this package is tied to systemd, only build it when we're also building systemd. python () { - if not oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): + 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/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" INITSCRIPT_PARAMS_udev = "start 03 S ." python __anonymous() { - if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") } @@ -348,6 +348,6 @@ pkg_prerm_udev-hwdb () { # 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): + 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/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 () { # As systemd also builds udev, skip this package if we're doing a systemd build. python () { - if oe.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): + if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d): raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES") } do_compile_ptest() { -- cgit v1.2.3-54-g00ecf