From ee66f55213b1fd5a006e8638d524e490c9f65f3b Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 7 Apr 2006 20:30:43 +0000
Subject: rework fakeroot handling to avoid races during parallel make causing
 several fakeroot instances stomping eachother's temp files.

---
 target/tar/tarroot.mk | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'target/tar/tarroot.mk')

diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 867adc1b9..cbf538653 100644
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -4,30 +4,32 @@
 #
 #############################################################
 
-TAR_OPTS := $(strip $(subst ",, $(BR2_TARGET_ROOTFS_TAR_OPTIONS)))
-#"
-tarroot: host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env
+TAR_OPTS:=$(strip $(BR2_TARGET_ROOTFS_TAR_OPTIONS))
+TAR_TARGET:=$(IMAGE).tar
+
+tarroot: host-fakeroot makedevs
 	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
 	@rm -rf $(TARGET_DIR)/usr/man
 	@rm -rf $(TARGET_DIR)/usr/info
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
+	rm -f $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/fakeroot.env \
-		-s $(STAGING_DIR)/fakeroot.env -- \
+		-i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) -- \
 		chown -R root:root $(TARGET_DIR)
 	# Use fakeroot to pretend to create all needed device nodes
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/fakeroot.env \
-		-s $(STAGING_DIR)/fakeroot.env -- \
-		$(STAGING_DIR)/bin/makedevs \
-		-d $(TARGET_DEVICE_TABLE) \
-		$(TARGET_DIR)
+		-i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) -- \
+		$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
 	# Use fakeroot so tar believes the previous fakery
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/fakeroot.env \
-		-s $(STAGING_DIR)/fakeroot.env -- \
-		tar -c$(TAR_OPTS)f $(IMAGE).tar -C $(TARGET_DIR) .
+		-i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) -- \
+	    tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) .
+	-@rm -f $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
 
 tarroot-source:
 
-- 
cgit v1.2.3