X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2FMakefile;h=e88efdfe9f692e6061b3843041af6c4a1bfb6fc8;hb=976bbc4212434b01a9d3aa1f2e4f4b9d56ef5519;hp=63fdb92bae5ae5895f4611fd629bbd529713570c;hpb=a5ff4c2e978f74e3856b8500aa226b7f01f209e8;p=openwrt.git

diff --git a/package/Makefile b/package/Makefile
index 63fdb92bae..e88efdfe9f 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,30 +71,25 @@ 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)
 
 $(curdir)/install: $(TMP_DIR)/.build
 	- find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755
-	rm -rf $(TARGET_DIR) $(STAGING_DIR_ROOT)
+	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
 	@if [ -d $(TOPDIR)/files ]; then \
-		( cd $(TOPDIR)/files; find -type f ) | \
-			( cd $(TARGET_DIR); while :; do \
-				read FILE; \
-				[ -z "$$FILE" ] && break; \
-				[ -L "$$FILE" ] || continue; \
-				echo "Removing symlink $(TARGET_DIR)/$$FILE"; \
-				rm -f "$$FILE"; \
-			done; ); \
-		$(CP) $(TOPDIR)/files/. $(TARGET_DIR); \
+		$(call file_copy,$(TOPDIR)/files/.,$(TARGET_DIR)); \
 	fi
 	@mkdir -p $(TARGET_DIR)/etc/rc.d
 	@( \
@@ -121,6 +116,7 @@ $(curdir)/preconfig:
 $(curdir)/flags-install:= -j1
 
 $(eval $(call stampfile,$(curdir),package,prereq,.config))
+$(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build))
 $(eval $(call stampfile,$(curdir),package,install,$(TMP_DIR)/.build))