aboutsummaryrefslogtreecommitdiffstats
path: root/include
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
commita62f0d02ec82d8a4c9618076a7893665dc21cf78 (patch)
tree19c4a3dbe2fe00c79cc71f7cf78a0b3309d8f382 /include
parent38a8f5ae63ea357ec57638c9161fd2f4fa843181 (diff)
downloadupstream-a62f0d02ec82d8a4c9618076a7893665dc21cf78.tar.gz
upstream-a62f0d02ec82d8a4c9618076a7893665dc21cf78.tar.bz2
upstream-a62f0d02ec82d8a4c9618076a7893665dc21cf78.zip
build: allow packages with build variants to explicitly select a default variant
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42654
Diffstat (limited to 'include')
-rw-r--r--include/package-defaults.mk1
-rw-r--r--include/package-dumpinfo.mk3
2 files changed, 3 insertions, 1 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 051cde5020..19f2a16045 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -53,6 +53,7 @@ define Package/Default
HIDDEN:=
URL:=
VARIANT:=
+ DEFAULT_VARIANT:=
USERID:=
endef
diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index 0241580522..5d1d76fee5 100644
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -34,7 +34,8 @@ Depends: $(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
Menu-Depends: $(MDEPENDS)
Provides: $(PROVIDES)
$(if $(VARIANT),Build-Variant: $(VARIANT)
-)$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)
+$(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT)
+))$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS)
)$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS)
)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES)
)Section: $(SECTION)