Revert "scripts/package-metadata.pl: fix handling transitive conditio…

…nal dependencies" This reverts commit 6c3eff9. This appears to cause some regressions in generated config. Will be replaced with a fixed version later Signed-off-by: Felix Fietkau <[email protected]>
wangbing1087 · Sep 1, 2023 · 6252c18 · 6252c18
1 parent 33303b5
commit 6252c18
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
@@ -161,6 +161,9 @@ sub mconf_depends {
 		my $condition = $parent_condition;
 
 		next if $condition eq $depend;
+		next if $seen->{"$parent_condition:$depend"};
+		next if $seen->{":$depend"};
+		$seen->{"$parent_condition:$depend"} = 1;
 		if ($depend =~ /^(.+):(.+)$/) {
 			if ($1 ne "PACKAGE_$pkgname") {
 				if ($condition) {
@@ -171,9 +174,6 @@ sub mconf_depends {
 			}
 			$depend = $2;
 		}
-		next if $seen->{"$parent_condition:$depend"};
-		next if $seen->{":$depend"};
-		$seen->{"$parent_condition:$depend"} = 1;
 		if ($flags =~ /\+/) {
 			my $vdep = $vpackage{$depend};
 			if ($vdep) {