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/libc-package.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/libc-package.bbclass')
| -rw-r--r-- | meta/classes/libc-package.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 0af42a002c..c1bc399c18 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass | |||
| @@ -37,9 +37,9 @@ python __anonymous () { | |||
| 37 | break | 37 | break |
| 38 | 38 | ||
| 39 | # try to fix disable charsets/locales/locale-code compile fail | 39 | # try to fix disable charsets/locales/locale-code compile fail |
| 40 | if oe.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) and \ | 40 | if bb.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) and \ |
| 41 | oe.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d) and \ | 41 | bb.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d) and \ |
| 42 | oe.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d): | 42 | bb.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d): |
| 43 | d.setVar('PACKAGE_NO_GCONV', '0') | 43 | d.setVar('PACKAGE_NO_GCONV', '0') |
| 44 | else: | 44 | else: |
| 45 | d.setVar('PACKAGE_NO_GCONV', '1') | 45 | d.setVar('PACKAGE_NO_GCONV', '1') |