[source] scripts/package-metadata.pl: honour DEFAULT_VARIANT

[LEDE Commits]

jow pushed a commit to source.git, branch master:
https://git.lede-project.org/12d15fa8a5096913927d75958d0ed3af9d963e73

commit 12d15fa8a5096913927d75958d0ed3af9d963e73
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Wed Nov 2 01:45:06 2016 +0100

    scripts/package-metadata.pl: honour DEFAULT_VARIANT
    
    So far, package-metadata.pl always considered the first provider of a virtual
    package to be the default variant which might deviate from what buildroot
    considers to be the default.
    
    Change the Kconfig dependency / select code generation for virtual package
    providers to consider the DEFAULT_VARIANT to be the primary provider and only
    fall back to the first provider if no default variant was explicitely tagged.
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 scripts/package-metadata.pl | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 1a4f103..f8f16f0 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -176,8 +176,21 @@ sub mconf_depends {
 		next if $package{$depend} and $package{$depend}->{buildonly};
 		if ($flags =~ /\+/) {
 			if ($vdep = $package{$depend}->{vdepends}) {
-				my @vdeps = @$vdep;
-				$depend = shift @vdeps;
+				my @vdeps;
+				$depend = undef;
+
+				foreach my $v (@$vdep) {
+					if ($package{$v} && $package{$v}->{variant_default}) {
+						$depend = $v;
+					} else {
+						push @vdeps, $v;
+					}
+				}
+
+				if (!$depend) {
+					$depend = shift @vdeps;
+				}
+
 				if (@vdeps > 1) {
 					$condition = ($condition ? "$condition && " : '') . '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';
 				} elsif (@vdeps > 0) {