X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=scripts%2Fkconfig.pl;h=6a6bbd27472b929005e22f42498057603c8ae457;hp=c76e2978b2092e28b4bb5606b82a37ea87f664a2;hb=c02f41c1d2f2626de551da01c800938066e564c6;hpb=9a3368ebca2057f5bfa73f6f3e97bd54b9b0a07b

diff --git a/scripts/kconfig.pl b/scripts/kconfig.pl
index c76e2978b2..6a6bbd2747 100755
--- a/scripts/kconfig.pl
+++ b/scripts/kconfig.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # 
-# Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+# Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,19 +12,32 @@ use strict;
 my @arg;
 my $PREFIX = "CONFIG_";
 
-sub load_config($) {
+sub set_config($$$$) {
+	my $config = shift;
+	my $idx = shift;
+	my $newval = shift;
+	my $mod_plus = shift;
+
+	if (!defined($config->{$idx}) or !$mod_plus or
+	    $config->{$idx} eq '#undef' or $newval eq 'y') {
+		$config->{$idx} = $newval;
+	}
+}
+
+sub load_config($$) {
 	my $file = shift;
+	my $mod_plus = shift;
 	my %config;
 
-	open FILE, "$file" or die "can't open file";
+	open FILE, "$file" or die "can't open file '$file'";
 	while (<FILE>) {
 		chomp;
 		/^$PREFIX(.+?)=(.+)/ and do {
-			$config{$1} = $2;
+			set_config(\%config, $1, $2, $mod_plus);
 			next;
 		};
 		/^# $PREFIX(.+?) is not set/ and do {
-			$config{$1} = "#undef";
+			set_config(\%config, $1, "#undef", $mod_plus);
 			next;
 		};
 		/^#/ and next;
@@ -60,20 +73,25 @@ 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};
 		}
 	}
 	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};
 		}
 	}
@@ -111,14 +129,13 @@ sub dump_config($) {
 	}
 }
 
-sub parse_expr($);
-
-sub parse_expr($) {
+sub parse_expr {
 	my $pos = shift;
+	my $mod_plus = shift;
 	my $arg = $arg[$$pos++];
-	
+
 	die "Parse error" if (!$arg);
-	
+
 	if ($arg eq '&') {
 		my $arg1 = parse_expr($pos);
 		my $arg2 = parse_expr($pos);
@@ -129,18 +146,22 @@ sub parse_expr($) {
 		return config_add($arg1, $arg2, 0);
 	} elsif ($arg =~ /^m\+/) {
 		my $arg1 = parse_expr($pos);
-		my $arg2 = parse_expr($pos);
+		my $arg2 = parse_expr($pos, 1);
 		return config_add($arg1, $arg2, 1);
 	} 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);
 		return config_sub($arg1, $arg2);
 	} else {
-		return load_config($arg);
+		return load_config($arg, $mod_plus);
 	}
 }