diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-11-07 16:15:22 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-11-07 16:15:22 +0000 |
| commit | d3e90ba7a76ce42b747a15879b4c7e4728309a57 (patch) | |
| tree | b37ca033a676f71dc95bf99d321f6f4a39f3af93 /package | |
| parent | f2bb7754f5255141205a73e9e7709a49bb55bb4a (diff) | |
| download | upstream-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 'package')
| -rw-r--r-- | package/Makefile | 14 |
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 |