From d4b77f3145856dec4399b0d9627ac2986401b47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BCsch?= Date: Fri, 29 Oct 2010 15:07:23 +0000 Subject: [PATCH] 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 --- include/package-ipkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 $$@