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/busybox | |
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/busybox')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index a107a020c1..f35779dc49 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -47,18 +47,16 @@ def busybox_cfg(feature, features, tokens, cnf, rem): | |||
47 | else: | 47 | else: |
48 | cnf.extend(['# ' + token + ' is not set' for token in tokens]) | 48 | cnf.extend(['# ' + token + ' is not set' for token in tokens]) |
49 | 49 | ||
50 | # Map distro and machine features to config settings | 50 | # Map distro features to config settings |
51 | def features_to_busybox_settings(d): | 51 | def features_to_busybox_settings(d): |
52 | cnf, rem = ([], []) | 52 | cnf, rem = ([], []) |
53 | distro_features = d.getVar('DISTRO_FEATURES', True).split() | 53 | distro_features = d.getVar('DISTRO_FEATURES', True).split() |
54 | machine_features = d.getVar('MACHINE_FEATURES', True).split() | ||
55 | busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IPV6', cnf, rem) | 54 | busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IPV6', cnf, rem) |
56 | busybox_cfg('largefile', distro_features, 'CONFIG_LFS', cnf, rem) | 55 | busybox_cfg('largefile', distro_features, 'CONFIG_LFS', cnf, rem) |
57 | busybox_cfg('largefile', distro_features, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) | 56 | busybox_cfg('largefile', distro_features, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) |
58 | busybox_cfg('nls', distro_features, 'CONFIG_LOCALE_SUPPORT', cnf, rem) | 57 | busybox_cfg('nls', distro_features, 'CONFIG_LOCALE_SUPPORT', cnf, rem) |
59 | busybox_cfg('ipv4', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) | 58 | busybox_cfg('ipv4', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) |
60 | busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) | 59 | busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) |
61 | busybox_cfg('kernel24', machine_features, 'CONFIG_FEATURE_2_4_MODULES', cnf, rem) | ||
62 | return "\n".join(cnf), "\n".join(rem) | 60 | return "\n".join(cnf), "\n".join(rem) |
63 | 61 | ||
64 | # X, Y = ${@features_to_uclibc_settings(d)} | 62 | # X, Y = ${@features_to_uclibc_settings(d)} |