From 2335304a08827f4f083eba2bfb73163516c5fd57 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 22 Jul 2012 21:00:07 +0000
Subject: 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
---
 scripts/kconfig.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts/kconfig.pl')

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};
 		}
 	}
-- 
cgit v1.2.3