build: only install packages for selected variants, fixes building multiple variant selections in one tree

SVN-Revision: 34656
This commit is contained in:
Felix Fietkau 2012-12-13 13:07:01 +00:00
parent 71712ec522
commit 64f0b22052

View File

@ -70,8 +70,19 @@ OPKG:= \
--add-arch all:100 \ --add-arch all:100 \
--add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200
PACKAGE_INSTALL:=$(sort $(foreach pkg,$(package-y),$(lastword $(subst /,$(space),$(pkg))))) PACKAGE_INSTALL_FILES:= \
PACKAGE_INSTALL_FILES:=$(patsubst %,$(PKG_INFO_DIR)/%.*.install,$(PACKAGE_INSTALL)) $(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 $(curdir)/cleanup: $(TMP_DIR)/.build
rm -rf $(STAGING_DIR_ROOT) rm -rf $(STAGING_DIR_ROOT)