svn commit: trunk/buildroot: target/cramfs target/ext2 target/iso966 etc...

[andersen at uclibc.org]

Author: andersen
Date: 2006-04-07 15:42:15 -0700 (Fri, 07 Apr 2006)
New Revision: 14778

Log:
make sure things still work even when fakeroot is not in active use


Modified:
   trunk/buildroot/Makefile
   trunk/buildroot/target/cramfs/cramfs.mk
   trunk/buildroot/target/ext2/ext2root.mk
   trunk/buildroot/target/iso9660/iso9660.mk
   trunk/buildroot/target/jffs2/jffs2root.mk
   trunk/buildroot/target/squashfs/squashfsroot.mk
   trunk/buildroot/target/tar/tarroot.mk


Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile	2006-04-07 20:30:43 UTC (rev 14777)
+++ trunk/buildroot/Makefile	2006-04-07 22:42:15 UTC (rev 14778)
@@ -111,7 +111,7 @@
 	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
 

Modified: trunk/buildroot/target/cramfs/cramfs.mk
===================================================================
--- trunk/buildroot/target/cramfs/cramfs.mk	2006-04-07 20:30:43 UTC (rev 14777)
+++ trunk/buildroot/target/cramfs/cramfs.mk	2006-04-07 22:42:15 UTC (rev 14778)
@@ -68,6 +68,7 @@
 	-/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) \

Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk	2006-04-07 20:30:43 UTC (rev 14777)
+++ trunk/buildroot/target/ext2/ext2root.mk	2006-04-07 22:42:15 UTC (rev 14778)
@@ -73,6 +73,7 @@
 	-/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) \

Modified: trunk/buildroot/target/iso9660/iso9660.mk
===================================================================
--- trunk/buildroot/target/iso9660/iso9660.mk	2006-04-07 20:30:43 UTC (rev 14777)
+++ trunk/buildroot/target/iso9660/iso9660.mk	2006-04-07 22:42:15 UTC (rev 14778)
@@ -61,6 +61,7 @@
 	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) \

Modified: trunk/buildroot/target/jffs2/jffs2root.mk
===================================================================
--- trunk/buildroot/target/jffs2/jffs2root.mk	2006-04-07 20:30:43 UTC (rev 14777)
+++ trunk/buildroot/target/jffs2/jffs2root.mk	2006-04-07 22:42:15 UTC (rev 14778)
@@ -46,6 +46,7 @@
 	-/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) \

Modified: trunk/buildroot/target/squashfs/squashfsroot.mk
===================================================================
--- trunk/buildroot/target/squashfs/squashfsroot.mk	2006-04-07 20:30:43 UTC (rev 14777)
+++ trunk/buildroot/target/squashfs/squashfsroot.mk	2006-04-07 22:42:15 UTC (rev 14778)
@@ -62,6 +62,7 @@
 	-/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) \

Modified: trunk/buildroot/target/tar/tarroot.mk
===================================================================
--- trunk/buildroot/target/tar/tarroot.mk	2006-04-07 20:30:43 UTC (rev 14777)
+++ trunk/buildroot/target/tar/tarroot.mk	2006-04-07 22:42:15 UTC (rev 14778)
@@ -14,6 +14,7 @@
 	-/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) \