diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-09-23 10:41:15 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-23 10:41:15 +0000 |
| commit | 51b28882cc70f0b3b55acd2e316e072927f004a6 (patch) | |
| tree | 4c51aa7a0d1ca58d315b1d810fa9de01cf708ed8 /scripts/metadata.pl | |
| parent | 200e1d786d1cdd816cdf6f17e6933319c04a3ed3 (diff) | |
| download | upstream-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/metadata.pl')
| -rwxr-xr-x | scripts/metadata.pl | 2 |
1 files changed, 1 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" |