mirrors/openwrt
0
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-01 13:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

scripts/package-metadata.pl: fix generation of dependencies on virtual packages

Browse Source 
Dependencies on purely virtual packages (satisfied by PROVIDES) that were
not using "selects" ("+" flag) would be prepended with the prefix
"PACKAGE_" twice, breaking the first alternative.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2016-09-23 23:17:09 +02:00
parent 4f272dd032
commit 6177b649ca
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/package-metadata.pl
View File

@ -193,12 +193,15 @@ sub mconf_depends {
$m = "select"; $m = "select";
next if $only_dep; next if $only_dep;
$flags =~ /@/ or $depend = "PACKAGE_$depend";
} else { } else {
if ($vdep = $package{$depend}->{vdepends}) { if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep); $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else {
$flags =~ /@/ or $depend = "PACKAGE_$depend";
} }
} }
$flags =~ /@/ or $depend = "PACKAGE_$depend";
if ($condition) { if ($condition) {
if ($m =~ /select/) { if ($m =~ /select/) {
next if $depend eq $condition; next if $depend eq $condition;