diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:19 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (patch) | |
tree | bfbf9bface6e748f3ab50d4a86046fc850b0c153 /meta/classes/update-rc.d.bbclass | |
parent | f11e9e295d7f8a1e0219fb7a45a5a134a773aae2 (diff) | |
download | poky-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/classes/update-rc.d.bbclass')
-rw-r--r-- | meta/classes/update-rc.d.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass index 0ac2af7d97..81cc97621a 100644 --- a/meta/classes/update-rc.d.bbclass +++ b/meta/classes/update-rc.d.bbclass | |||
@@ -117,7 +117,7 @@ python populate_packages_updatercd () { | |||
117 | 117 | ||
118 | # Check that this class isn't being inhibited (generally, by | 118 | # Check that this class isn't being inhibited (generally, by |
119 | # systemd.bbclass) before doing any work. | 119 | # systemd.bbclass) before doing any work. |
120 | if oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ | 120 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \ |
121 | not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True): | 121 | not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True): |
122 | pkgs = d.getVar('INITSCRIPT_PACKAGES', True) | 122 | pkgs = d.getVar('INITSCRIPT_PACKAGES', True) |
123 | if pkgs == None: | 123 | if pkgs == None: |