From 5418a92350168fbdc1f07839c783cb70952ecc06 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 7 Apr 2006 22:42:15 +0000
Subject: make sure things still work even when fakeroot is not in active use

---
 Makefile                        | 2 +-
 target/cramfs/cramfs.mk         | 1 +
 target/ext2/ext2root.mk         | 1 +
 target/iso9660/iso9660.mk       | 1 +
 target/jffs2/jffs2root.mk       | 1 +
 target/squashfs/squashfsroot.mk | 1 +
 target/tar/tarroot.mk           | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7f4ca69d0..eb5f3e592 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ $(TARGET_DIR):
 	if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
 		cp -a $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
 	fi;
-	touch $(STAGING_DIR)/fakeroot.env
+	touch $(STAGING_DIR)/.fakeroot.00000
 	-find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
 	-find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
 
diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 1205c0030..b0ab28f23 100644
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -68,6 +68,7 @@ cramfsroot: host-fakeroot makedevs cramfs
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET)
+	touch $(STAGING_DIR)/.fakeroot.00000
 	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
 		-i $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) \
diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index 06ab3d2f3..bf2ae8353 100644
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -73,6 +73,7 @@ $(EXT2_BASE): host-fakeroot makedevs genext2fs
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET)
+	touch $(STAGING_DIR)/.fakeroot.00000
 	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
 		-i $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) \
diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index 1bc415aed..df8950413 100644
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -61,6 +61,7 @@ $(ISO9660_TARGET): host-fakeroot $(EXT2_TARGET) grub mkisofs
 	cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
+	touch $(STAGING_DIR)/.fakeroot.00000
 	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
 		-i $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) \
diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 2c6ad5eb7..d50bc88db 100644
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -46,6 +46,7 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
+	touch $(STAGING_DIR)/.fakeroot.00000
 	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
 		-i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 10f0c5205..f41c9660b 100644
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -62,6 +62,7 @@ squashfsroot: host-fakeroot makedevs squashfs
 	-/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)
+	touch $(STAGING_DIR)/.fakeroot.00000
 	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
 		-i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \
diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index cbf538653..e68ece75f 100644
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -14,6 +14,7 @@ tarroot: host-fakeroot makedevs
 	-/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)
+	touch $(STAGING_DIR)/.fakeroot.00000
 	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
 		-i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
-- 
cgit v1.2.3