From 7034fa3c32a217fc571c880550f3365d51e6f589 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 13 Dec 2012 13:07:01 +0000 Subject: 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 --- package/Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/package/Makefile b/package/Makefile index e88efdfe9..df7cf79f2 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) -- cgit v1.2.3