Prevent problems with fakeroot possibly trying to use stale host filesystem

inodes by carefully regenerating fakeroot.env from package specific files.

diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index edf2ffddee23f5df0a24c5503de8646e17507680..0d4082de295e9bc7ef02d8419dbdd0aef1014277 100644 (file)
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -15,26 +15,26 @@ $(DL_DIR)/$(LTP_TESTSUITE_SOURCE):
 
 ltp-testsuite-source: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE)
 
-$(LTP_TESTSUITE_DIR)/.unpacked: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE)
+$(LTP_TESTSUITE_DIR)/Makefile: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE)
        $(LTP_TESTSUITE_CAT) $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) | tar -C $(LTP_TESTSUITE_ROOT) $(TAR_OPTIONS) -
        toolchain/patch-kernel.sh $(LTP_TESTSUITE_DIR) package/ltp-testsuite/ ltp-testsuite\*.patch
-       touch $(LTP_TESTSUITE_DIR)/.unpacked
+       touch -c $(LTP_TESTSUITE_DIR)/Makefile
 
-$(LTP_TESTSUITE_DIR)/testcases/kernel/syscalls/write/write01: $(LTP_TESTSUITE_DIR)/.unpacked
-       $(MAKE) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
+$(LTP_TESTSUITE_DIR)/.compiled: $(LTP_TESTSUITE_DIR)/Makefile
+       $(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
                -C $(LTP_TESTSUITE_DIR) all
-       touch -c $(LTP_TESTSUITE_DIR)/testcases/kernel/syscalls/write/write01
+       touch $(LTP_TESTSUITE_DIR)/.compiled
 
-$(LTP_TESTSUITE_DIR)/testcases/bin/1K_file: $(LTP_TESTSUITE_DIR)/testcases/kernel/syscalls/write/write01
+$(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled
        # Use fakeroot to pretend to do 'make install' as root
+       rm -f $(STAGING_DIR)/.fakeroot.ltp
        $(STAGING_DIR)/usr/bin/fakeroot \
-               -i $(STAGING_DIR)/fakeroot.env \
-               -s $(STAGING_DIR)/fakeroot.env -- \
-               $(MAKE) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
+               -s $(STAGING_DIR)/.fakeroot.ltp -- \
+               $(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \
                        -C $(LTP_TESTSUITE_DIR) install
-       touch -c $(LTP_TESTSUITE_DIR)/testcases/bin/1K_file
+       touch $(LTP_TESTSUITE_DIR)/.installed
 
-ltp-testsuite: uclibc host-fakeroot $(LTP_TESTSUITE_DIR)/testcases/bin/1K_file
+ltp-testsuite: uclibc host-fakeroot $(LTP_TESTSUITE_DIR)/.installed
 
 ltp-testsuite-clean:
        $(MAKE) -C $(LTP_TESTSUITE_DIR) clean

diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 913a89cf27144fc6b363f5141ddcb8e38f952632..408ff3ac1ba85b2cd6c8d49f95956cb25aa05ba2 100644 (file)
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -58,7 +58,7 @@ ifeq ($(strip $(BR2_sparc)),y)
 CRAMFS_ENDIANNESS=-b
 endif
 
-cramfsroot: host-fakeroot makedevs cramfs
+cramfsroot: host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env cramfs
        #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true;
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
        @rm -rf $(TARGET_DIR)/usr/man

diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index 5f5bdb1eb87328189ee7a4ee606a6285bfa209e6..fec8795b53297b6b96d77e0525a3b763ea5a7c24 100644 (file)
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -65,7 +65,7 @@ else
 EXT2_TARGET := $(EXT2_BASE)
 endif
 
-$(EXT2_BASE): host-fakeroot makedevs genext2fs
+$(EXT2_BASE): host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env genext2fs
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/share/man

diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 03a0558808cd8efc57d8601a2834484413c65d74..c5efae52547f34b0b50547a10feb3d993697ae8a 100644 (file)
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -38,7 +38,7 @@ JFFS2_TARGET := $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT))
 # value of MKFS_JFFS2 to either the previously installed copy or the one
 # just built.
 #
-$(JFFS2_TARGET): host-fakeroot makedevs mtd-host
+$(JFFS2_TARGET): host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env mtd-host
        -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
        @rm -rf $(TARGET_DIR)/usr/man
        @rm -rf $(TARGET_DIR)/usr/share/man

diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 6fd106a5e9698a91c84f7c861f31b0b3c2b5accb..4a2ff2880a94921de5ef88fd565d48a00ed809d2 100644 (file)
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -53,7 +53,7 @@ ifeq ($(strip $(BR2_sparc)),y)
 SQUASHFS_ENDIANNESS=-be
 endif
 
-squashfsroot: host-fakeroot makedevs squashfs
+squashfsroot: host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env 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

diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 1d2d6a6cafdf6ff5af8513242ca75c4c0035eaed..307220ad25a266bdd55bc56aae8a785093793daa 100644 (file)
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -6,7 +6,7 @@
 
 TAR_OPTS := $(strip $(BR2_TARGET_ROOTFS_TAR_OPTIONS))
 
-tarroot: host-fakeroot makedevs
+tarroot: host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env
        -@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