summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd_211.bb
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:19 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit08a38a7865c41ec60f4b993b964f8d477ea0f680 (patch)
treebfbf9bface6e748f3ab50d4a86046fc850b0c153 /meta/recipes-core/systemd/systemd_211.bb
parentf11e9e295d7f8a1e0219fb7a45a5a134a773aae2 (diff)
downloadpoky-08a38a7865c41ec60f4b993b964f8d477ea0f680.tar.gz
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 <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd_211.bb')
-rw-r--r--meta/recipes-core/systemd/systemd_211.bb4
1 files changed, 2 insertions, 2 deletions
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}