mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-15 15:37:03 +00:00
Code Issues Projects Releases Wiki Activity

Globally replace oe.utils.contains to bb.utils.contains

Browse Source 
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>
This commit is contained in:
Otavio Salvador
2014-04-24 15:59:19 -03:00
committed by Richard Purdie
parent f11e9e295d
commit 08a38a7865
15 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/dpkg/dpkg.inc
+1 -1
View File
@@ -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')
}
meta/recipes-devtools/gcc/gcc-common.inc
+2 -2
View File
@@ -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 ""
meta/recipes-devtools/opkg/opkg.inc
+1 -1
View File
@@ -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')
}
meta/recipes-devtools/perl/perl-ptest.inc
+1 -1
View File
@@ -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)
}