qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-30 17:59:21 +02:00
Code

scripts/kconfig.pl: backport changes from trunk

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26535 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-04-08 18:55:16 +00:00
parent 0d2ab1ea02
commit 6f99ef9c52
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/kconfig.pl
View File

@ -80,13 +80,15 @@ sub config_add($$$) {
return \%config; return \%config;
} }
sub config_diff($$) { sub config_diff($$$) {
my $cfg1 = shift; my $cfg1 = shift;
my $cfg2 = shift; my $cfg2 = shift;
my $new_only = shift;
my %config; my %config;
foreach my $config (keys %$cfg2) { foreach my $config (keys %$cfg2) {
if (!defined($cfg1->{$config}) or $cfg1->{$config} ne $cfg2->{$config}) { 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}; $config{$config} = $cfg2->{$config};
} }
} }
@ -146,7 +148,11 @@ sub parse_expr {
} elsif ($arg eq '>') { } elsif ($arg eq '>') {
my $arg1 = parse_expr($pos); my $arg1 = parse_expr($pos);
my $arg2 = 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 '-') { } elsif ($arg eq '-') {
my $arg1 = parse_expr($pos); my $arg1 = parse_expr($pos);
my $arg2 = parse_expr($pos); my $arg2 = parse_expr($pos);