diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
| commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
| tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-core/eglibc/eglibc-options.inc | |
| parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
| download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz | |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-options.inc')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-options.inc | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc index 0432758417..259e752858 100644 --- a/meta/recipes-core/eglibc/eglibc-options.inc +++ b/meta/recipes-core/eglibc/eglibc-options.inc | |||
| @@ -14,43 +14,43 @@ def eglibc_cfg(feature, tokens, cnf): | |||
| 14 | def features_to_eglibc_settings(d): | 14 | def features_to_eglibc_settings(d): |
| 15 | cnf = ([]) | 15 | cnf = ([]) |
| 16 | 16 | ||
| 17 | ipv4 = base_contains('DISTRO_FEATURES', 'ipv4', True, False, d) | 17 | ipv4 = bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d) |
| 18 | ipv6 = base_contains('DISTRO_FEATURES', 'ipv6', True, False, d) | 18 | ipv6 = bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d) |
| 19 | libc_backtrace = base_contains('DISTRO_FEATURES', 'libc-backtrace', True, False, d) | 19 | libc_backtrace = bb.utils.contains('DISTRO_FEATURES', 'libc-backtrace', True, False, d) |
| 20 | libc_big_macros = base_contains('DISTRO_FEATURES', 'libc-big-macros', True, False, d) | 20 | libc_big_macros = bb.utils.contains('DISTRO_FEATURES', 'libc-big-macros', True, False, d) |
| 21 | libc_bsd = base_contains('DISTRO_FEATURES', 'libc-bsd', True, False, d) | 21 | libc_bsd = bb.utils.contains('DISTRO_FEATURES', 'libc-bsd', True, False, d) |
| 22 | libc_cxx_tests = base_contains('DISTRO_FEATURES', 'libc-cxx-tests', True, False, d) | 22 | libc_cxx_tests = bb.utils.contains('DISTRO_FEATURES', 'libc-cxx-tests', True, False, d) |
| 23 | libc_catgets = base_contains('DISTRO_FEATURES', 'libc-catgets', True, False, d) | 23 | libc_catgets = bb.utils.contains('DISTRO_FEATURES', 'libc-catgets', True, False, d) |
| 24 | libc_charsets = base_contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) | 24 | libc_charsets = bb.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) |
| 25 | libc_crypt = base_contains('DISTRO_FEATURES', 'libc-crypt', True, False, d) | 25 | libc_crypt = bb.utils.contains('DISTRO_FEATURES', 'libc-crypt', True, False, d) |
| 26 | libc_crypt_ufc = base_contains('DISTRO_FEATURES', 'libc-crypt-ufc', True, False, d) | 26 | libc_crypt_ufc = bb.utils.contains('DISTRO_FEATURES', 'libc-crypt-ufc', True, False, d) |
| 27 | libc_db_aliases = base_contains('DISTRO_FEATURES', 'libc-db-aliases', True, False, d) | 27 | libc_db_aliases = bb.utils.contains('DISTRO_FEATURES', 'libc-db-aliases', True, False, d) |
| 28 | libc_envz = base_contains('DISTRO_FEATURES', 'libc-envz', True, False, d) | 28 | libc_envz = bb.utils.contains('DISTRO_FEATURES', 'libc-envz', True, False, d) |
| 29 | libc_fcvt = base_contains('DISTRO_FEATURES', 'libc-fcvt', True, False, d) | 29 | libc_fcvt = bb.utils.contains('DISTRO_FEATURES', 'libc-fcvt', True, False, d) |
| 30 | libc_fmtmsg = base_contains('DISTRO_FEATURES', 'libc-fmtmsg', True, False, d) | 30 | libc_fmtmsg = bb.utils.contains('DISTRO_FEATURES', 'libc-fmtmsg', True, False, d) |
| 31 | libc_fstab = base_contains('DISTRO_FEATURES', 'libc-fstab', True, False, d) | 31 | libc_fstab = bb.utils.contains('DISTRO_FEATURES', 'libc-fstab', True, False, d) |
| 32 | libc_ftraverse = base_contains('DISTRO_FEATURES', 'libc-ftraverse', True, False, d) | 32 | libc_ftraverse = bb.utils.contains('DISTRO_FEATURES', 'libc-ftraverse', True, False, d) |
| 33 | libc_getlogin = base_contains('DISTRO_FEATURES', 'libc-getlogin', True, False, d) | 33 | libc_getlogin = bb.utils.contains('DISTRO_FEATURES', 'libc-getlogin', True, False, d) |
| 34 | libc_idn = base_contains('DISTRO_FEATURES', 'libc-idn', True, False, d) | 34 | libc_idn = bb.utils.contains('DISTRO_FEATURES', 'libc-idn', True, False, d) |
| 35 | libc_inet_anl = base_contains('DISTRO_FEATURES', 'libc-inet-anl', True, False, d) | 35 | libc_inet_anl = bb.utils.contains('DISTRO_FEATURES', 'libc-inet-anl', True, False, d) |
| 36 | libc_libm = base_contains('DISTRO_FEATURES', 'libc-libm', True, False, d) | 36 | libc_libm = bb.utils.contains('DISTRO_FEATURES', 'libc-libm', True, False, d) |
| 37 | libc_locales = base_contains('DISTRO_FEATURES', 'libc-locales', True, False, d) | 37 | libc_locales = bb.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d) |
| 38 | libc_locale_code = base_contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d) | 38 | libc_locale_code = bb.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d) |
| 39 | libc_memusage = base_contains('DISTRO_FEATURES', 'libc-memusage', True, False, d) | 39 | libc_memusage = bb.utils.contains('DISTRO_FEATURES', 'libc-memusage', True, False, d) |
| 40 | libc_nis = base_contains('DISTRO_FEATURES', 'libc-nis', True, False, d) | 40 | libc_nis = bb.utils.contains('DISTRO_FEATURES', 'libc-nis', True, False, d) |
| 41 | libc_nsswitch = base_contains('DISTRO_FEATURES', 'libc-nsswitch', True, False, d) | 41 | libc_nsswitch = bb.utils.contains('DISTRO_FEATURES', 'libc-nsswitch', True, False, d) |
| 42 | libc_rcmd = base_contains('DISTRO_FEATURES', 'libc-rcmd', True, False, d) | 42 | libc_rcmd = bb.utils.contains('DISTRO_FEATURES', 'libc-rcmd', True, False, d) |
| 43 | libc_rtld_debug = base_contains('DISTRO_FEATURES', 'libc-rtld-debug', True, False, d) | 43 | libc_rtld_debug = bb.utils.contains('DISTRO_FEATURES', 'libc-rtld-debug', True, False, d) |
| 44 | libc_spawn = base_contains('DISTRO_FEATURES', 'libc-spawn', True, False, d) | 44 | libc_spawn = bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', True, False, d) |
| 45 | libc_streams = base_contains('DISTRO_FEATURES', 'libc-streams', True, False, d) | 45 | libc_streams = bb.utils.contains('DISTRO_FEATURES', 'libc-streams', True, False, d) |
| 46 | libc_sunrpc = base_contains('DISTRO_FEATURES', 'libc-sunrpc', True, False, d) | 46 | libc_sunrpc = bb.utils.contains('DISTRO_FEATURES', 'libc-sunrpc', True, False, d) |
| 47 | libc_utmp = base_contains('DISTRO_FEATURES', 'libc-utmp', True, False, d) | 47 | libc_utmp = bb.utils.contains('DISTRO_FEATURES', 'libc-utmp', True, False, d) |
| 48 | libc_utmpx = base_contains('DISTRO_FEATURES', 'libc-utmpx', True, False, d) | 48 | libc_utmpx = bb.utils.contains('DISTRO_FEATURES', 'libc-utmpx', True, False, d) |
| 49 | libc_wordexp = base_contains('DISTRO_FEATURES', 'libc-wordexp', True, False, d) | 49 | libc_wordexp = bb.utils.contains('DISTRO_FEATURES', 'libc-wordexp', True, False, d) |
| 50 | libc_posix_clang_wchar = base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', True, False, d) | 50 | libc_posix_clang_wchar = bb.utils.contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', True, False, d) |
| 51 | libc_posix_regexp = base_contains('DISTRO_FEATURES', 'libc-posix-regexp', True, False, d) | 51 | libc_posix_regexp = bb.utils.contains('DISTRO_FEATURES', 'libc-posix-regexp', True, False, d) |
| 52 | libc_posix_regexp_glibc = base_contains('DISTRO_FEATURES', 'libc-posix-regexp-glibc', True, False, d) | 52 | libc_posix_regexp_glibc = bb.utils.contains('DISTRO_FEATURES', 'libc-posix-regexp-glibc', True, False, d) |
| 53 | libc_posix_wchar_io = base_contains('DISTRO_FEATURES', 'libc-posix-wchar-io', True, False, d) | 53 | libc_posix_wchar_io = bb.utils.contains('DISTRO_FEATURES', 'libc-posix-wchar-io', True, False, d) |
| 54 | 54 | ||
| 55 | # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code | 55 | # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code |
| 56 | new_dep = True | 56 | new_dep = True |