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>

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index a107a02..f35779d 100644 (file)
--- 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)}

diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc
index 3de3845..8bb0948 100644 (file)
--- 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):
        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_uclibc_settings(d):
        cnf, rem = ([], [])
        distro_features = d.getVar('DISTRO_FEATURES', True).split()
-       machine_features = d.getVar('MACHINE_FEATURES', True).split()
        uclibc_cfg('ipv4',      distro_features, 'UCLIBC_HAS_IPV4', cnf, rem)
        uclibc_cfg('ipv6',      distro_features, 'UCLIBC_HAS_IPV6', cnf, rem)
        uclibc_cfg('largefile', distro_features, 'UCLIBC_HAS_LFS', cnf, rem)
@@ -104,7 +103,6 @@ def features_to_uclibc_settings(d):
        uclibc_cfg('xattr',     distro_features, 'UCLIBC_HAS_XATTR', cnf, rem)
        uclibc_cfg('ssp',       distro_features, 'UCLIBC_HAS_SSP', cnf, rem)
        uclibc_cfg('argp',       distro_features, 'UCLIBC_HAS_ARGP', cnf, rem)
-       uclibc_cfg('kernel24',  machine_features,'UCLIBC_LINUX_MODULE_24', cnf, rem)
        uclibc_cfg('libc-posix-clang-wchar',  distro_features,'UCLIBC_HAS_WCHAR', cnf, rem)
        return "\n".join(cnf), "\n".join(rem)
 # X, Y = ${@features_to_uclibc_settings(d)}