From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 23 Sep 2016 21:17:09 +0000 (+0200)
Subject: scripts/package-metadata.pl: fix generation of dependencies on virtual packages
X-Git-Tag: v17.01.0-rc1~1398
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6177b649ca8cd11545fe945245b449236ac4bd50;p=openwrt%2Fopenwrt.git

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

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>
---

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 44494efd28..09aed96c2b 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -193,12 +193,15 @@ sub mconf_depends {
 
 			$m = "select";
 			next if $only_dep;
+
+			$flags =~ /@/ or $depend = "PACKAGE_$depend";
 		} else {
 			if ($vdep = $package{$depend}->{vdepends}) {
 				$depend = join("||", map { "PACKAGE_".$_ } @$vdep);
+			} else {
+				$flags =~ /@/ or $depend = "PACKAGE_$depend";
 			}
 		}
-		$flags =~ /@/ or $depend = "PACKAGE_$depend";
 		if ($condition) {
 			if ($m =~ /select/) {
 				next if $depend eq $condition;