mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

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

SVN-Revision: 25232
This commit is contained in:
Felix Fietkau 2011-01-29 02:35:24 +00:00
parent 024dc6ea5f
commit b760b5fcf7
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;
}
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);