Reset condition for each dependeny when generating mconf files. Previously all

dependencys listed after a conditional dependency had the same condition.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14335 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 4 insertions, 3 deletions

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index da29fdd89..fa3055620 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -375,7 +375,7 @@ sub mconf_depends {
 	my $res;
 	my $dep = shift;
 	my $seen = shift;
-	my $condition = shift;
+	my $parent_condition = shift;
 	$dep or $dep = {};
 	$seen or $seen = {};
 
@@ -386,11 +386,12 @@ sub mconf_depends {
 		$depend =~ s/^([@\+]+)//;
 		my $flags = $1;
 		my $vdep;
+		my $condition;
 
 		if ($depend =~ /^(.+):(.+)$/) {
 			if ($1 ne "PACKAGE_$pkgname") {
-				if ($condition) {
-					$condition = "$condition && $1";
+				if ($parent_condition) {
+					$condition = "$parent_condition && $1";
 				} else {
 					$condition = $1;
 				}