aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-09-23 10:41:15 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-09-23 10:41:15 +0000
commit51b28882cc70f0b3b55acd2e316e072927f004a6 (patch)
tree4c51aa7a0d1ca58d315b1d810fa9de01cf708ed8 /scripts
parent200e1d786d1cdd816cdf6f17e6933319c04a3ed3 (diff)
downloadupstream-51b28882cc70f0b3b55acd2e316e072927f004a6.tar.gz
upstream-51b28882cc70f0b3b55acd2e316e072927f004a6.tar.bz2
upstream-51b28882cc70f0b3b55acd2e316e072927f004a6.zip
build: allow packages with build variants to explicitly select a default variant
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42654 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/metadata.pl2
-rw-r--r--scripts/metadata.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 79f930c5ea..4014613de6 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -684,7 +684,7 @@ sub gen_package_mk() {
$pkg->{buildonly} and $config = "";
print "package-$config += $pkg->{subdir}$pkg->{src}\n";
if ($pkg->{variant}) {
- if (!defined($done{$pkg->{src}})) {
+ if (!defined($done{$pkg->{src}}) or $pkg->{variant_default}) {
print "\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
}
print "\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if $config,$pkg->{variant})\n"
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 0e55c8ebed..ab5abc0363 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -115,6 +115,7 @@ sub parse_package_metadata($) {
/^Depends: \s*(.+)\s*$/ and $pkg->{depends} = [ split /\s+/, $1 ];
/^Hidden: \s*(.+)\s*$/ and $pkg->{hidden} = 1;
/^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1;
+ /^Default-Variant: .*/ and $pkg->{variant_default} = 1;
/^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;
/^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [ split /\s+/, $1 ];
/^Build-Depends\/(\w+): \s*(.+)\s*$/ and $pkg->{"builddepends/$1"} = [ split /\s+/, $2 ];