aboutsummaryrefslogtreecommitdiffstats
path: root/include/package.mk
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-11-07 16:15:22 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-11-07 16:15:22 +0000
commitd3e90ba7a76ce42b747a15879b4c7e4728309a57 (patch)
treeb37ca033a676f71dc95bf99d321f6f4a39f3af93 /include/package.mk
parentf2bb7754f5255141205a73e9e7709a49bb55bb4a (diff)
downloadupstream-d3e90ba7a76ce42b747a15879b4c7e4728309a57.tar.gz
upstream-d3e90ba7a76ce42b747a15879b4c7e4728309a57.tar.bz2
upstream-d3e90ba7a76ce42b747a15879b4c7e4728309a57.zip
buildroot: isolate the .install stamp files for build variants (#12279)
This fixes missing embedded packages if multiple build variants are selected in the build config, e.g. missing ppp if CONFIG_PACKAGE_ppp=y and CONFIG_PACKAGE_ppp-multilink=m . SVN-Revision: 34106
Diffstat (limited to 'include/package.mk')
-rw-r--r--include/package.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk
index fb90df8718..c1fe088ece 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -52,6 +52,7 @@ ifneq ($(if $(CONFIG_SRC_TREE_OVERRIDE),$(wildcard ./git-src)),)
endif
PKG_DIR_NAME:=$(lastword $(subst /,$(space),$(CURDIR)))
+PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD_VARIANT),default).install
include $(INCLUDE_DIR)/download.mk
include $(INCLUDE_DIR)/quilt.mk
@@ -254,8 +255,8 @@ Build/DistCheck=$(call Build/DistCheck/Default,)
.PHONY: prepare-package-install
prepare-package-install:
@mkdir -p $(PKG_INFO_DIR)
- @touch $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.clean
- @echo "$(filter-out essential,$(PKG_FLAGS))" > $(PKG_INFO_DIR)/$(PKG_DIR_NAME).install.flags
+ @touch $(PKG_INSTALL_STAMP).clean
+ @echo "$(filter-out essential,$(PKG_FLAGS))" > $(PKG_INSTALL_STAMP).flags
$(PACKAGE_DIR):
mkdir -p $@