summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig.pl
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-07-22 21:00:07 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-07-22 21:00:07 +0000
commit7922ab6eda2140e43d8d34a2324cc08631cf64d1 (patch)
tree1bf7bee3e102c76985b0d433ed4bc341afc0a5c5 /scripts/kconfig.pl
parentbd4fb35eed6e8313785286d85d399ad3e02a2d90 (diff)
build: ensure that reordering of KCONFIG lines are handled properly and that the final result does not depend on the package scan order
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32788 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts/kconfig.pl')
-rwxr-xr-xscripts/kconfig.pl5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/kconfig.pl b/scripts/kconfig.pl
index 811327353..b91cdf397 100755
--- a/scripts/kconfig.pl
+++ b/scripts/kconfig.pl
@@ -73,7 +73,10 @@ sub config_add($$$) {
my %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};
}
}