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 /include | |
| 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 'include')
| -rw-r--r-- | include/package-defaults.mk | 1 | ||||
| -rw-r--r-- | include/package-dumpinfo.mk | 3 |
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) |