RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-02-27 18:27:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 6c3eff9dd8.
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>
This commit is contained in:
Felix Fietkau 2023-09-01 18:34:36 +02:00
parent 33303b5cec
commit 6252c18d1c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/package-metadata.pl
View File

@ -161,6 +161,9 @@ sub mconf_depends {
my $condition = $parent_condition; my $condition = $parent_condition;
next if $condition eq $depend; next if $condition eq $depend;
next if $seen->{"$parent_condition:$depend"};
next if $seen->{":$depend"};
$seen->{"$parent_condition:$depend"} = 1;
if ($depend =~ /^(.+):(.+)$/) { if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") { if ($1 ne "PACKAGE_$pkgname") {
if ($condition) { if ($condition) {
@ -171,9 +174,6 @@ sub mconf_depends {
} }
$depend = $2; $depend = $2;
} }
next if $seen->{"$parent_condition:$depend"};
next if $seen->{":$depend"};
$seen->{"$parent_condition:$depend"} = 1;
if ($flags =~ /\+/) { if ($flags =~ /\+/) {
my $vdep = $vpackage{$depend}; my $vdep = $vpackage{$depend};
if ($vdep) { if ($vdep) {