From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 2 Sep 2009 19:01:09 +0000 (+0000)
Subject: build: when staging unstripped package files, install them to a temporary directory... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6ceb1cacecee94cadffd0c4cab677c0d21e452e;p=openwrt%2Fstaging%2Flinusw.git

build: when staging unstripped package files, install them to a temporary directory first to work around file overwrite issues in packages like asterisk

SVN-Revision: 17477
---

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 904bbd75af..4409f239ae 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -59,9 +59,11 @@ ifeq ($(DUMP),)
     $(eval $(call BuildIPKGVariable,$(1),postrm))
 
     $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(STAMP_BUILT)
-	mkdir -p $(STAGING_DIR_ROOT)/stamp
-	$(call Package/$(1)/install,$(STAGING_DIR_ROOT))
-	$(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT))
+	mkdir -p $(STAGING_DIR_ROOT)/stamp $(STAGING_DIR_ROOT)/tmp-$(1)
+	$(call Package/$(1)/install,$(STAGING_DIR_ROOT)/tmp-$(1))
+	$(call Package/$(1)/install_lib,$(STAGING_DIR_ROOT)/tmp-$(1))
+	$(CP) $(STAGING_DIR_ROOT)/tmp-$(1)/* $(STAGING_DIR_ROOT)/
+	rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
 	touch $$@
 
     $$(IPKG_$(1)): $(STAGING_DIR)/etc/ipkg.conf $(STAMP_BUILT)