diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-09-01 18:34:36 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2023-09-01 18:34:58 +0200 |
| commit | 6252c18d1cae2a0f94e6a4bd706b98b210cf8063 (patch) | |
| tree | a07a5fefa5fe3b1f78078a24fd5a499a7b199189 /scripts | |
| parent | 33303b5cece071b13aafb689eed9faa7ca79efcd (diff) | |
| download | openwrt-6252c18d1cae2a0f94e6a4bd706b98b210cf8063.tar.gz openwrt-6252c18d1cae2a0f94e6a4bd706b98b210cf8063.tar.bz2 openwrt-6252c18d1cae2a0f94e6a4bd706b98b210cf8063.zip | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/package-metadata.pl | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |