aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commitee76e2804af260b48d29680f1d4ddc764d0a4b90 (patch)
tree5dc50ce1d84c29d9e22332dd6d6c17519dc056b8 /package
parent704a78d6b6d005caf38818730b6692846ff9dcfe (diff)
downloadmaster-187ad058-ee76e2804af260b48d29680f1d4ddc764d0a4b90.tar.gz
master-187ad058-ee76e2804af260b48d29680f1d4ddc764d0a4b90.tar.bz2
master-187ad058-ee76e2804af260b48d29680f1d4ddc764d0a4b90.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 . git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34106 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/Makefile b/package/Makefile
index 46bcb9d3c7..eab3f85dd6 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -60,7 +60,7 @@ OPKG:= \
IPKG_INSTROOT=$(TARGET_DIR) \
IPKG_CONF_DIR=$(STAGING_DIR)/etc \
IPKG_OFFLINE_ROOT=$(TARGET_DIR) \
- $(STAGING_DIR_HOST)/bin/opkg \
+ $(XARGS) $(STAGING_DIR_HOST)/bin/opkg \
--offline-root $(TARGET_DIR) \
--force-depends \
--force-overwrite \
@@ -71,7 +71,7 @@ OPKG:= \
--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:=$(patsubst %,$(PKG_INFO_DIR)/%.*.install,$(PACKAGE_INSTALL))
$(curdir)/cleanup: $(TMP_DIR)/.build
rm -rf $(STAGING_DIR_ROOT)
@@ -80,11 +80,11 @@ $(curdir)/install: $(TMP_DIR)/.build
- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
rm -rf $(TARGET_DIR)
[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
- $(OPKG) install `cat $(PACKAGE_INSTALL_FILES) | sed -e 's,^\(.*\)$$,$(PACKAGE_DIR)/\1_*.ipk,'`
- @for pkg in $(PACKAGE_INSTALL); do \
- [ -s $(PKG_INFO_DIR)/$${pkg}.install.flags ] || continue; \
- for flag in `cat $(PKG_INFO_DIR)/$${pkg}.install.flags`; do \
- $(OPKG) flag $$flag `cat $(PKG_INFO_DIR)/$${pkg}.install`; \
+ @$(FIND) `sed -e 's|.*|$(PACKAGE_DIR)/&_*.ipk|' $(PACKAGE_INSTALL_FILES)` | sort -u | $(OPKG) install
+ @for file in $(PACKAGE_INSTALL_FILES); do \
+ [ -s $$file.flags ] || continue; \
+ for flag in `cat $$file.flags`; do \
+ $(OPKG) flag $$flag < $$file; \
done; \
done || true
@-$(MAKE) package/preconfig