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:10:58 +0100 |
| commit | 93499ebc46547f5bf6dcecd5a786ead9f726de28 (patch) | |
| tree | cba2b38892d9f85f7967a4a875fe4b7b93587fc5 /meta/recipes-devtools | |
| parent | 4d0ecccae671bffb40c870a6e33d20be869b89bc (diff) | |
| download | openembedded-core-contrib-93499ebc46547f5bf6dcecd5a786ead9f726de28.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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl/perl-ptest.inc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index eef7ce9d40..ca44e98232 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -17,7 +17,7 @@ PARALLEL_MAKE = "" inherit autotools gettext perlnative pkgconfig systemd python () { - if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): pn = d.getVar('PN', True) d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'dpkg-configure.service') } diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index feb402e75d..1e00249b19 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -19,7 +19,7 @@ def get_gcc_fpu_setting(bb, d): get_gcc_fpu_setting[vardepvalue] = "${@get_gcc_fpu_setting(bb, d)}" def get_gcc_mips_plt_setting(bb, d): - if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'mips', 'mipsel' ] and oe.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d): + if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'mips', 'mipsel' ] and bb.utils.contains('DISTRO_FEATURES', 'mplt', True, False, d): return "--with-mips-plt" return "" @@ -32,7 +32,7 @@ def get_gcc_multiarch_setting(bb, d): "sparc": "--enable-targets=all", } - if oe.utils.contains('DISTRO_FEATURES', 'multiarch', True, False, d): + if bb.utils.contains('DISTRO_FEATURES', 'multiarch', True, False, d): if target_arch in multiarch_options : return multiarch_options[target_arch] return "" diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 9f87df551e..198e5001af 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -17,7 +17,7 @@ do_configure_prepend() { inherit autotools pkgconfig systemd python () { - if not oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): + if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): pn = d.getVar('PN', True) d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'opkg-configure.service') } diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index 914ca0f4c0..9ef7d0a262 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -42,7 +42,7 @@ python populate_packages_prepend() { # Put all *.t files from the lib dir in the ptest package # do_split_packages requires a pair of () in the regex, but we have nothing # to match, so use an empty pair. - if oe.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): + if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d): do_split_packages(d, d.expand('${libdir}/perl/${PV}'), '.*\.t()', '${PN}-ptest%s', '%s', recursive=True, match_path=True) } |