From: James Mckenzie <jamesmck@taoand.cam.xci-test.com>
Date: Mon, 30 Nov 2009 18:57:44 +0000 (+0000)
Subject: Fix rsync errors during build (race between find+chmod and rsync)
X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=6dfce72ac3b580b00df73df94ba90b2ba1681f06;p=xenclient%2Fbuild.git

Fix rsync errors during build (race between find+chmod and rsync)
---

diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk
index e009c8a..7fd706e 100644
--- a/toolchain/external-toolchain/ext-tool.mk
+++ b/toolchain/external-toolchain/ext-tool.mk
@@ -44,11 +44,17 @@ copy_toolchain_lib_root = \
  \
 	echo -n
 
+#copy_toolchain_sysroot = \
+#	SYSROOT_DIR=`$(TARGET_CC) -v 2>&1 | grep ^Configured | tr " " "\n" | grep -- "--with-sysroot" | cut -f2 -d=`; \
+#	cp -a $${SYSROOT_DIR}/* $(STAGING_DIR)/ ; \
+#	find $(STAGING_DIR) -type d | xargs chmod 755; \
+#	find $(STAGING_DIR) -type f | xargs xargs chmod +w
+
+EXT_SYSROOT_DIR=${shell $(TARGET_CC) -v 2>&1 | grep ^Configured | tr " " "\n" | grep -- "--with-sysroot" | cut -f2 -d=` }
+
 copy_toolchain_sysroot = \
-	SYSROOT_DIR=`$(TARGET_CC) -v 2>&1 | grep ^Configured | tr " " "\n" | grep -- "--with-sysroot" | cut -f2 -d=`; \
-	cp -a $${SYSROOT_DIR}/* $(STAGING_DIR)/ ; \
-	find $(STAGING_DIR) -type d | xargs chmod 755; \
-	find $(STAGING_DIR) -type f | xargs xargs chmod +w
+	tar cfC - ${EXT_SYSROOT_DIR}  --mode a+r+w+X .  | tar xfpBC - $(STAGING_DIR)
+
 
 uclibc: dependencies $(TARGET_DIR)/lib/$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C)))