From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 22 Jul 2012 21:00:07 +0000 (+0000)
Subject: build: ensure that reordering of KCONFIG lines are handled properly and that the... 
X-Git-Tag: fast2504n-3.10.28-merged~5474
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=7922ab6eda2140e43d8d34a2324cc08631cf64d1;p=openwrt.git

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
---

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';