aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-10-29 15:07:23 +0000
committerMichael Büsch <mb@bu3sch.de>2010-10-29 15:07:23 +0000
commitd4b77f3145856dec4399b0d9627ac2986401b47b (patch)
tree80cbfa80b97def455c417b07d38c7e68314a5aee /include
parent8db77876decb83915157d510edab03d57c75b70f (diff)
downloadupstream-d4b77f3145856dec4399b0d9627ac2986401b47b.tar.gz
upstream-d4b77f3145856dec4399b0d9627ac2986401b47b.tar.bz2
upstream-d4b77f3145856dec4399b0d9627ac2986401b47b.zip
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
Diffstat (limited to 'include')
-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 512e40186d..8ff0d70d1c 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 $$@