mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
f11e9e295d
commit
08a38a7865
@@ -37,9 +37,9 @@ python __anonymous () {
|
||||
break
|
||||
|
||||
# try to fix disable charsets/locales/locale-code compile fail
|
||||
if oe.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) and \
|
||||
oe.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d) and \
|
||||
oe.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d):
|
||||
if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) and \
|
||||
bb.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d) and \
|
||||
bb.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d):
|
||||
d.setVar('PACKAGE_NO_GCONV', '0')
|
||||
else:
|
||||
d.setVar('PACKAGE_NO_GCONV', '1')
|
||||
|
||||
Reference in New Issue
Block a user