diff options
author | Andrei Gherzan <andrei.gherzan@windriver.com> | 2012-01-17 13:28:31 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 15:15:53 +0000 |
commit | e2a3695ad44935e8dba6fb4d6e631fc7af5ab754 (patch) | |
tree | 1a2a42d1f277fe3b6c1484bbbbdfb432d1fa747b /meta/recipes-core/uclibc | |
parent | 8773ebef268c88fa214e3db3dbf201cd7f56a031 (diff) | |
download | poky-e2a3695ad44935e8dba6fb4d6e631fc7af5ab754.tar.gz |
busybox/uglibc: remove obsolete check for "kernel24"
Busybox checks if MACHINE_FEATURES contains "kernel24". If so, CONFIG_FEATURE_2_4_MODULES will be on "y".
kernel24 is no longer present in any machine configuration. The same situation is in uglibc with a
different CONFIG mapping.
[YOCTO #1901]
(From OE-Core rev: 7257ded5355ffdc0fc169e7f34daeedb0b3dcd78)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/uclibc')
-rw-r--r-- | meta/recipes-core/uclibc/uclibc-config.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc index 3de3845984..8bb094800d 100644 --- a/meta/recipes-core/uclibc/uclibc-config.inc +++ b/meta/recipes-core/uclibc/uclibc-config.inc | |||
@@ -91,11 +91,10 @@ def uclibc_cfg(feature, features, tokens, cnf, rem): | |||
91 | else: | 91 | else: |
92 | cnf.extend(['# ' + token + ' is not set' for token in tokens]) | 92 | cnf.extend(['# ' + token + ' is not set' for token in tokens]) |
93 | 93 | ||
94 | # Map distro and machine features to config settings | 94 | # Map distro features to config settings |
95 | def features_to_uclibc_settings(d): | 95 | def features_to_uclibc_settings(d): |
96 | cnf, rem = ([], []) | 96 | cnf, rem = ([], []) |
97 | distro_features = d.getVar('DISTRO_FEATURES', True).split() | 97 | distro_features = d.getVar('DISTRO_FEATURES', True).split() |
98 | machine_features = d.getVar('MACHINE_FEATURES', True).split() | ||
99 | uclibc_cfg('ipv4', distro_features, 'UCLIBC_HAS_IPV4', cnf, rem) | 98 | uclibc_cfg('ipv4', distro_features, 'UCLIBC_HAS_IPV4', cnf, rem) |
100 | uclibc_cfg('ipv6', distro_features, 'UCLIBC_HAS_IPV6', cnf, rem) | 99 | uclibc_cfg('ipv6', distro_features, 'UCLIBC_HAS_IPV6', cnf, rem) |
101 | uclibc_cfg('largefile', distro_features, 'UCLIBC_HAS_LFS', cnf, rem) | 100 | uclibc_cfg('largefile', distro_features, 'UCLIBC_HAS_LFS', cnf, rem) |
@@ -104,7 +103,6 @@ def features_to_uclibc_settings(d): | |||
104 | uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem) | 103 | uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem) |
105 | uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem) | 104 | uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem) |
106 | uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem) | 105 | uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem) |
107 | uclibc_cfg('kernel24', machine_features,'UCLIBC_LINUX_MODULE_24', cnf, rem) | ||
108 | uclibc_cfg('libc-posix-clang-wchar', distro_features,'UCLIBC_HAS_WCHAR', cnf, rem) | 106 | uclibc_cfg('libc-posix-clang-wchar', distro_features,'UCLIBC_HAS_WCHAR', cnf, rem) |
109 | return "\n".join(cnf), "\n".join(rem) | 107 | return "\n".join(cnf), "\n".join(rem) |
110 | # X, Y = ${@features_to_uclibc_settings(d)} | 108 | # X, Y = ${@features_to_uclibc_settings(d)} |