aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei.gherzan@windriver.com>2012-01-17 13:28:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 15:15:29 +0000
commit7257ded5355ffdc0fc169e7f34daeedb0b3dcd78 (patch)
treec025939362f12109ed858f215e0e0f2b42f56672 /meta/recipes-core/busybox
parent6d21c87ca37a11b34551d79758da65ed417c70a0 (diff)
downloadopenembedded-core-contrib-7257ded5355ffdc0fc169e7f34daeedb0b3dcd78.tar.gz
openembedded-core-contrib-7257ded5355ffdc0fc169e7f34daeedb0b3dcd78.tar.bz2
openembedded-core-contrib-7257ded5355ffdc0fc169e7f34daeedb0b3dcd78.zip
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] 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.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index a107a020c16..f35779dc499 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):
else:
cnf.extend(['# ' + token + ' is not set' for token in tokens])
-# Map distro and machine features to config settings
+# Map distro features to config settings
def features_to_busybox_settings(d):
cnf, rem = ([], [])
distro_features = d.getVar('DISTRO_FEATURES', True).split()
- machine_features = d.getVar('MACHINE_FEATURES', True).split()
busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IPV6', cnf, rem)
busybox_cfg('largefile', distro_features, 'CONFIG_LFS', cnf, rem)
busybox_cfg('largefile', distro_features, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem)
busybox_cfg('nls', distro_features, 'CONFIG_LOCALE_SUPPORT', cnf, rem)
busybox_cfg('ipv4', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem)
- busybox_cfg('kernel24', machine_features, 'CONFIG_FEATURE_2_4_MODULES', cnf, rem)
return "\n".join(cnf), "\n".join(rem)
# X, Y = ${@features_to_uclibc_settings(d)}