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/squashfs/squashfsroot.mk | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'target/squashfs/squashfsroot.mk')

diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 4a2ff2880..10f0c5205 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -53,31 +53,34 @@ ifeq ($(strip $(BR2_sparc)),y)
 SQUASHFS_ENDIANNESS=-be
 endif
 
-squashfsroot: host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env squashfs
+SQUASHFS_TARGET:=$(IMAGE).squashfs
+
+squashfsroot: host-fakeroot makedevs squashfs
 	-@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.$(SQUASHFS_TARGET)
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/fakeroot.env \
-		-s $(STAGING_DIR)/fakeroot.env -- \
+		-i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_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.$(SQUASHFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) -- \
+		$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
 	# Use fakeroot so mksquashfs believes the previous fakery
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/fakeroot.env \
-		-s $(STAGING_DIR)/fakeroot.env -- \
-		$(SQUASHFS_DIR)/squashfs-tools/mksquashfs \
+		-i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) -- \
+	    $(SQUASHFS_DIR)/squashfs-tools/mksquashfs \
 		    $(TARGET_DIR) \
-		    $(IMAGE).squashfs \
+		    $(SQUASHFS_TARGET) \
 		    -noappend $(SQUASHFS_ENDIANNESS)
+	-@rm -f $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET)
 
 squashfsroot-source: squashfs-source
 
-- 
cgit v1.2.3