domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix recursive dependencies that might be caused by using conditional dependencies

Browse Source 
SVN-Revision: 13813
This commit is contained in:
Felix Fietkau
2009-01-02 02:49:02 +00:00
parent d0c5a0d576
commit e5905aebb7
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/metadata.pl
View File

@@ -368,7 +368,8 @@ sub package_depends($$) {
return $ret; return $ret;
} }
sub mconf_depends($$) { sub mconf_depends {
my $pkgname = shift;
my $depends = shift; my $depends = shift;
my $only_dep = shift; my $only_dep = shift;
my $res; my $res;
@@ -387,7 +388,13 @@ sub mconf_depends($$) {
my $vdep; my $vdep;
if ($depend =~ /^(.+):(.+)$/) { if ($depend =~ /^(.+):(.+)$/) {
$condition and $condition = "$condition && $1" or $condition = $1; if ($1 ne "PACKAGE_$pkgname") {
if ($condition) {
$condition = "$condition && $1";
} else {
$condition = $1;
}
}
$depend = $2; $depend = $2;
} }
next if $seen->{$depend}; next if $seen->{$depend};
@@ -400,13 +407,19 @@ sub mconf_depends($$) {
# thus if FOO depends on other config options, these dependencies # thus if FOO depends on other config options, these dependencies
# will not be checked. To fix this, we simply emit all of FOO's # will not be checked. To fix this, we simply emit all of FOO's
# depends here as well. # depends here as well.
$package{$depend} and mconf_depends($package{$depend}->{depends}, 1, $dep, $seen, $condition); $package{$depend} and mconf_depends($pkgname, $package{$depend}->{depends}, 1, $dep, $seen, $condition);
$m = "select"; $m = "select";
next if $only_dep; next if $only_dep;
}; };
$flags =~ /@/ or $depend = "PACKAGE_$depend"; $flags =~ /@/ or $depend = "PACKAGE_$depend";
$condition and ($m =~ /select/ and $depend = "$depend if $condition" or $depend = "!($condition) || $depend"); if ($condition) {
if ($m =~ /select/) {
$depend = "$depend if $condition";
} else {
$depend = "!($condition) || $depend";
}
}
} }
$dep->{$depend} =~ /select/ or $dep->{$depend} = $m; $dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
} }
@@ -468,7 +481,7 @@ sub print_package_config_category($) {
foreach my $default (split /\s*,\s*/, $pkg->{default}) { foreach my $default (split /\s*,\s*/, $pkg->{default}) {
print "\t\tdefault $default\n"; print "\t\tdefault $default\n";
} }
print mconf_depends($pkg->{depends}, 0); print mconf_depends($pkg->{name}, $pkg->{depends}, 0);
print "\t\thelp\n"; print "\t\thelp\n";
print $pkg->{description}; print $pkg->{description};
print "\n"; print "\n";