From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 29 Jan 2011 02:35:24 +0000 (+0000)
Subject: scripts/kconfig.pl: add a mode to generate a config diff that ignores added undefined... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=7aa6677e141f57b63b39c31dc50a7034b6f4e023

scripts/kconfig.pl: add a mode to generate a config diff that ignores added undefined config values

SVN-Revision: 25232
---

diff --git a/scripts/kconfig.pl b/scripts/kconfig.pl
index 7073e3b1ae..8113273538 100755
--- a/scripts/kconfig.pl
+++ b/scripts/kconfig.pl
@@ -80,13 +80,15 @@ sub config_add($$$) {
 	return \%config;
 }
 
-sub config_diff($$) {
+sub config_diff($$$) {
 	my $cfg1 = shift;
 	my $cfg2 = shift;
+	my $new_only = shift;
 	my %config;
 	
 	foreach my $config (keys %$cfg2) {
 		if (!defined($cfg1->{$config}) or $cfg1->{$config} ne $cfg2->{$config}) {
+			next if $new_only and !defined($cfg1->{$config}) and $cfg2->{$config} eq '#undef';
 			$config{$config} = $cfg2->{$config};
 		}
 	}
@@ -146,7 +148,11 @@ sub parse_expr {
 	} elsif ($arg eq '>') {
 		my $arg1 = parse_expr($pos);
 		my $arg2 = parse_expr($pos);
-		return config_diff($arg1, $arg2);
+		return config_diff($arg1, $arg2, 0);
+	} elsif ($arg eq '>+') {
+		my $arg1 = parse_expr($pos);
+		my $arg2 = parse_expr($pos);
+		return config_diff($arg1, $arg2, 1);
 	} elsif ($arg eq '-') {
 		my $arg1 = parse_expr($pos);
 		my $arg2 = parse_expr($pos);