diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-07-22 21:00:07 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-07-22 21:00:07 +0000 |
commit | 2335304a08827f4f083eba2bfb73163516c5fd57 (patch) | |
tree | d54824af9e02be484acdf6caecd364b786250516 /scripts/kconfig.pl | |
parent | b59bc92c6edf517d0a2d958530ac58fc58f74c32 (diff) | |
download | upstream-2335304a08827f4f083eba2bfb73163516c5fd57.tar.gz upstream-2335304a08827f4f083eba2bfb73163516c5fd57.tar.bz2 upstream-2335304a08827f4f083eba2bfb73163516c5fd57.zip |
build: ensure that reordering of KCONFIG lines are handled properly and that the final result does not depend on the package scan order
SVN-Revision: 32788
Diffstat (limited to 'scripts/kconfig.pl')
-rwxr-xr-x | scripts/kconfig.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/kconfig.pl b/scripts/kconfig.pl index 8113273538..b91cdf397a 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}; } } |