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

LEDE Commits lede-commits at lists.infradead.org
Fri Sep 23 14:29:32 PDT 2016


neoraider pushed a commit to source.git, branch master:
https://git.lede-project.org/6177b649ca8cd11545fe945245b449236ac4bd50

commit 6177b649ca8cd11545fe945245b449236ac4bd50
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Fri Sep 23 23:17:09 2016 +0200

    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 at universe-factory.net>
---
 scripts/package-metadata.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 44494ef..09aed96 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;



More information about the lede-commits mailing list