diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-13 13:07:01 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-13 13:07:01 +0000 |
| commit | 7034fa3c32a217fc571c880550f3365d51e6f589 (patch) | |
| tree | 1e46eb926a1f0596255ac60750a6968a97e07358 | |
| parent | b1ca3fb853a6fd6882c04c47921412fa3a2b1f6d (diff) | |
build: only install packages for selected variants, fixes building multiple variant selections in one tree
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34656 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/package/Makefile b/package/Makefile index e88efdfe9f..df7cf79f2e 100644 --- a/package/Makefile +++ b/package/Makefile @@ -70,8 +70,19 @@ OPKG:= \ --add-arch all:100 \ --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 -PACKAGE_INSTALL:=$(sort $(foreach pkg,$(package-y),$(lastword $(subst /,$(space),$(pkg))))) -PACKAGE_INSTALL_FILES:=$(patsubst %,$(PKG_INFO_DIR)/%.*.install,$(PACKAGE_INSTALL)) +PACKAGE_INSTALL_FILES:= \ + $(foreach pkg,$(sort $(package-y)), \ + $(foreach variant, \ + $(if $(package/$(pkg)/variants), \ + $(package/$(pkg)/variants), \ + $(if $(package/$(pkg)/default-variant), \ + $(package/$(pkg)/default-variant), \ + default \ + ) \ + ), \ + $(PKG_INFO_DIR)/$(lastword $(subst /,$(space),$(pkg))).$(variant).install \ + ) \ + ) $(curdir)/cleanup: $(TMP_DIR)/.build rm -rf $(STAGING_DIR_ROOT) |