From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 1 Sep 2023 16:34:36 +0000 (+0200)
Subject: Revert "scripts/package-metadata.pl: fix handling transitive conditional dependencies"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6252c18d1cae2a0f94e6a4bd706b98b210cf8063;p=openwrt%2Fstaging%2Fblocktrron.git

Revert "scripts/package-metadata.pl: fix handling transitive conditional dependencies"

This reverts commit 6c3eff9dd8bb8d0f268e8a0dbedbc6a33bdac796.
This appears to cause some regressions in generated config.
Will be replaced with a fixed version later

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 3e9e4e986e..4b2f5c8bde 100755
--- 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) {