summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-29 15:07:23 +0000
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-10-29 15:07:23 +0000
commit7f14e127691864dc8e5ad615b14cf61421eefb7a (patch)
tree80cbfa80b97def455c417b07d38c7e68314a5aee
parent4af18f43633a19ceb38848901306dcf5f46074d5 (diff)
Lock copying to STAGING_DIR_ROOT. This fixes build failures for parallelized build.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23709 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-ipkg.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 512e40186..8ff0d70d1 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -80,7 +80,7 @@ ifeq ($(DUMP),)
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)/
+ $(call locked,$(CP) $(STAGING_DIR_ROOT)/tmp-$(1)/. $(STAGING_DIR_ROOT)/,root-copy)
rm -rf $(STAGING_DIR_ROOT)/tmp-$(1)
touch $$@