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 | e5ddfdef84992918489ae911c3dc0954d1a805b5 (patch) | |
| tree | 1bf7bee3e102c76985b0d433ed4bc341afc0a5c5 | |
| parent | 7da8fc992d778092da06f7346a633c0dd7c2e0a6 (diff) | |
| download | upstream-e5ddfdef84992918489ae911c3dc0954d1a805b5.tar.gz upstream-e5ddfdef84992918489ae911c3dc0954d1a805b5.tar.bz2 upstream-e5ddfdef84992918489ae911c3dc0954d1a805b5.zip | |
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
| -rwxr-xr-x | scripts/kconfig.pl | 5 | ||||
| -rwxr-xr-x | scripts/metadata.pl | 1 |
2 files changed, 5 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}; } } diff --git a/scripts/metadata.pl b/scripts/metadata.pl index d250a71978..bd6dbc54ac 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -115,6 +115,7 @@ sub gen_kconfig_overrides() { $val = $2; } if ($config{"CONFIG_PACKAGE_$package"} and ($config ne 'n')) { + next if $kconfig{$config} eq 'y'; $kconfig{$config} = $val; } elsif (!$override) { $kconfig{$config} or $kconfig{$config} = 'n'; |