Patchwork busybox uglic: remove obsolete check for "kernel24"

login
register
mail settings
Submitter Andrei Gherzan
Date Jan. 17, 2012, 11:28 a.m.
Message ID <1326799711-31142-1-git-send-email-andrei@gherzan.ro>
Download mbox | patch
Permalink /patch/19579/
State New
Headers show

Comments

Andrei Gherzan - Jan. 17, 2012, 11:28 a.m.
From: Andrei Gherzan <andrei.gherzan@windriver.com>

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
Richard Purdie - Jan. 17, 2012, 3:17 p.m.
On Tue, 2012-01-17 at 13:28 +0200, Andrei Gherzan wrote:
> From: Andrei Gherzan <andrei.gherzan@windriver.com>
> 
> 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>
> ---
>  meta/recipes-core/busybox/busybox.inc      |    4 +---
>  meta/recipes-core/uclibc/uclibc-config.inc |    4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)

Merged to master with minor tweaks to the commit shortlog, thanks.

Richard
Andrei Gherzan - Jan. 17, 2012, 3:26 p.m.
On 01/17/2012 05:17 PM, Richard Purdie wrote:
> On Tue, 2012-01-17 at 13:28 +0200, Andrei Gherzan wrote:
>> From: Andrei Gherzan<andrei.gherzan@windriver.com>
>>
>> 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>
>> ---
>>   meta/recipes-core/busybox/busybox.inc      |    4 +---
>>   meta/recipes-core/uclibc/uclibc-config.inc |    4 +---
>>   2 files changed, 2 insertions(+), 6 deletions(-)
> Merged to master with minor tweaks to the commit shortlog, thanks.
After a "git pull" I can't see the change.

@g
Richard Purdie - Jan. 17, 2012, 3:56 p.m.
On Tue, 2012-01-17 at 17:26 +0200, Andrei Gherzan wrote:
> On 01/17/2012 05:17 PM, Richard Purdie wrote:
> > On Tue, 2012-01-17 at 13:28 +0200, Andrei Gherzan wrote:
> >> From: Andrei Gherzan<andrei.gherzan@windriver.com>
> >>
> >> 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>
> >> ---
> >>   meta/recipes-core/busybox/busybox.inc      |    4 +---
> >>   meta/recipes-core/uclibc/uclibc-config.inc |    4 +---
> >>   2 files changed, 2 insertions(+), 6 deletions(-)
> > Merged to master with minor tweaks to the commit shortlog, thanks.
> After a "git pull" I can't see the change.

Its in poky and OE-Core:

http://git.openembedded.org/openembedded-core/commit/?id=7257ded5355ffdc0fc169e7f34daeedb0b3dcd78
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=e2a3695ad44935e8dba6fb4d6e631fc7af5ab754

The mirror you're using mustn't have updated yet?

Cheers,

Richard

Patch

different CONFIG mapping.

[YOCTO #1901]

Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
 meta/recipes-core/busybox/busybox.inc      |    4 +---
 meta/recipes-core/uclibc/uclibc-config.inc |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index a107a02..f35779d 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)}
diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc
index 3de3845..8bb0948 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):
 	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)}