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

diff --git a/Makefile b/Makefile
index 7f4ca69d0f28452620cc061fbc4e7d019ecf005f..eb5f3e592f316ec0348e6f938ba3075f6f897199 100644 (file)
--- 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 1205c0030e89b9f44bdca8ed589e12a50be0282c..b0ab28f23407cd067472c1ff4ecdfea351e5b983 100644 (file)
--- 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 06ab3d2f3bb177a0f4f3e987fdadae00f9cacbd0..bf2ae835393ae26f705739d5f6ed509135c091f0 100644 (file)
--- 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 1bc415aed59f6e763a94859631df2e322f1d532b..df8950413bb385e22d56bab62cfe958c8e5e2f30 100644 (file)
--- 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 2c6ad5eb755176a10ff4398f33ab410fb37107fe..d50bc88db2253df0e66fbfb76780d03274cb69a8 100644 (file)
--- 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 10f0c5205a185b9dd359a455d0fbd10064e8cce1..f41c9660bdd227ff2b73d0f40aa73015f6855cb2 100644 (file)
--- 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 cbf538653cf1dd92f39c74b673e8bbb9bc6b8ea6..e68ece75f724e1c6d0c19713799c1e7915554cff 100644 (file)
--- 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) \