qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 19:44:05 +02:00
Code

build: ensure that reordering of KCONFIG lines are handled properly and that the final result does not depend on the package scan order

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32788 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2012-07-22 21:00:07 +00:00
parent bd4fb35eed
commit 7922ab6eda
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/kconfig.pl
View File

@ -73,7 +73,10 @@ sub config_add($$$) {
my %cfg = %$_; my %cfg = %$_;
foreach my $config (keys %cfg) { foreach my $config (keys %cfg) {
next if $mod_plus and $config{$config} and $config{$config} eq "y"; if ($mod_plus and $config{$config}) {
next if $config{$config} eq "y";
next if $cfg{$config} eq '#undef';
}
$config{$config} = $cfg{$config}; $config{$config} = $cfg{$config};
} }
} }

1
scripts/metadata.pl
View File

@ -115,6 +115,7 @@ sub gen_kconfig_overrides() {
$val = $2; $val = $2;
} }
if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) { if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) {
next if $kconfig{$config} eq 'y';
$kconfig{$config} = $val; $kconfig{$config} = $val;
} elsif (!$override) { } elsif (!$override) {
$kconfig{$config} or $kconfig{$config} = 'n'; $kconfig{$config} or $kconfig{$config} = 'n';