Move fakeroot temps from STAGING_DIR to PROJECT_BUILD_DIR

diff --git a/Makefile b/Makefile
index e94f978d84057abff7638a65297237c0ce208b99..b9e4cd2642b145b9c31cba24b6b25f21a2e93a03 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -260,7 +260,7 @@ $(PROJECT_BUILD_DIR)/.root:
 $(TARGET_DIR): $(PROJECT_BUILD_DIR)/.root
 
 erase-fakeroots:
-       rm -f $(STAGING_DIR)/.fakeroot*
+       rm -f $(PROJECT_BUILD_DIR)/.fakeroot*
 
 source: $(TARGETS_SOURCE) $(HOST_SOURCE)
 

diff --git a/package/at/at.mk b/package/at/at.mk
index 0ce088636eaa7fd68bdbe91cb81bcc2164146fda..296da2ea3f467f572057d1cd6cff58126e8c246f 100644 (file)
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -49,8 +49,8 @@ $(TARGET_DIR)/$(AT_TARGET_SCRIPT): $(AT_DIR)/$(AT_BINARY)
        # Use fakeroot to pretend to do 'make install' as root
        echo '$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root ' \
                '$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install' \
-               > $(STAGING_DIR)/.fakeroot.at
-       echo 'rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/doc/at' >> $(STAGING_DIR)/.fakeroot.at
+               > $(PROJECT_BUILD_DIR)/.fakeroot.at
+       echo 'rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/doc/at' >> $(PROJECT_BUILD_DIR)/.fakeroot.at
        $(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/$(AT_TARGET_SCRIPT)
 
 at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_SCRIPT)

diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
index 575a2eea286df3c27cca7f992839102c5ff90e82..706787fbfc5400f5e78ef791521da9c8063a18a4 100644 (file)
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -47,7 +47,7 @@ $(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled
        # Use fakeroot to pretend to do 'make install' as root
        echo '$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) ' \
                        '-C $(LTP_TESTSUITE_DIR) install' \
-                       > $(STAGING_DIR)/.fakeroot.ltp
+                       > $(PROJECT_BUILD_DIR)/.fakeroot.ltp
        touch $@
 
 ltp-testsuite: uclibc host-fakeroot $(LTP_TESTSUITE_DIR)/.installed

diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
index 3dc9013245eee3822c2604e6182d14eb9c4afff4..2fe86b499c88208863d012f00929054f0067dc54 100644 (file)
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -59,7 +59,7 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG)   += usr/sbin/rpcdebug
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD)   += usr/sbin/rpc.lockd
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
 
-$(STAGING_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY)
+$(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY)
        # Use fakeroot to pretend to do 'make install' as root
        echo '$(MAKE) prefix=$(TARGET_DIR)/usr statedir=$(TARGET_DIR)/var/lib/nfs $(TARGET_CONFIGURE_OPTS) -C $(NFS_UTILS_DIR) install' > $@
        echo 'rm -f $(TARGET_DIR)/usr/bin/event_rpcgen.py $(TARGET_DIR)/usr/sbin/nhfs* $(TARGET_DIR)/usr/sbin/nfsstat $(TARGET_DIR)/usr/sbin/showmount' >> $@
@@ -70,7 +70,7 @@ $(STAGING_DIR)/.fakeroot.nfs-utils: $(NFS_UTILS_DIR)/$(NFS_UTILS_BINARY)
        echo "file; done" >> $@
        echo 'rm -rf $(TARGET_DIR)/var/lib/nfs' >> $@
 
-$(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY): $(STAGING_DIR)/.fakeroot.nfs-utils
+$(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY): $(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils
        touch -c $@
 
 nfs-utils: uclibc host-fakeroot $(TARGET_DIR)/$(NFS_UTILS_TARGET_BINARY)
@@ -81,7 +81,7 @@ nfs-utils-clean:
                rm -f $(TARGET_DIR)/$$file; \
        done
        -$(MAKE) -C $(NFS_UTILS_DIR) clean
-       rm -f $(STAGING_DIR)/.fakeroot.nfs-utils
+       rm -f $(PROJECT_BUILD_DIR)/.fakeroot.nfs-utils
 
 nfs-utils-dirclean:
        rm -rf $(NFS_UTILS_DIR)

diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk
index 7b14d2186c5e2c13daf8b5640cdc0fc0a1b0bd2d..b2b4c4951f1a28a4119907510288deadd8925fdc 100644 (file)
--- a/target/cpio/cpioroot.mk
+++ b/target/cpio/cpioroot.mk
@@ -42,21 +42,21 @@ $(CPIO_BASE): host-fakeroot makedevs cpioroot-init
        @rm -rf $(TARGET_DIR)/usr/info
        -$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       touch $(STAGING_DIR)/.fakeroot.00000
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
-       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+       rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
+       cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
 endif
        # Use fakeroot so tar believes the previous fakery
        echo "cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $(CPIO_BASE)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
-       #-@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+       chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+       #-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
 
 ifneq ($(CPIO_ROOTFS_COMPRESSOR),)
 $(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT): $(CPIO_ROOTFS_COMPRESSOR_PREREQ) $(CPIO_BASE)

diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk
index 00064b4338785af199d29bdaad294d7d6659460f..63c31fd224812ec8d6c4aa72fc45726c5e0764e9 100644 (file)
--- a/target/cramfs/cramfs.mk
+++ b/target/cramfs/cramfs.mk
@@ -54,21 +54,21 @@ cramfsroot: host-fakeroot makedevs cramfs
        @rm -rf $(TARGET_DIR)/usr/info
        -$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
-       touch $(STAGING_DIR)/.fakeroot.00000
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
-       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+       rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+       touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
+       cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
 endif
        # Use fakeroot so mkcramfs believes the previous fakery
        echo "$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_ENDIANNESS) " \
-               "$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
-       -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+               "$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+       chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
+       -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET))
 
 cramfsroot-source: cramfs-source
 

diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk
index b79e9b2662cdfc7e5a10781503214db9b31d9c50..ebd4743f8a60f96d322f79de3c5d113efadc0395 100644 (file)
--- a/target/ext2/ext2root.mk
+++ b/target/ext2/ext2root.mk
@@ -96,14 +96,14 @@ $(EXT2_BASE): host-fakeroot makedevs genext2fs
                true
        -$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
-       touch $(STAGING_DIR)/.fakeroot.00000
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
-       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+       rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+       touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
+       cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
 endif
        # Use fakeroot so genext2fs believes the previous fakery
 ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
@@ -115,14 +115,14 @@ ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
        set -x; \
        echo "$(GENEXT2_DIR)/genext2fs -b $$GENEXT2_SIZE " \
                "-N $$GENEXT2_INODES -d $(TARGET_DIR) " \
-               "$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+               "$(EXT2_OPTS) $(EXT2_BASE)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
 else
        echo "$(GENEXT2_DIR)/genext2fs -d $(TARGET_DIR) " \
-               "$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+               "$(EXT2_OPTS) $(EXT2_BASE)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
 endif
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
-       -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+       chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
+       -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
 
 ifneq ($(EXT2_ROOTFS_COMPRESSOR),)
 $(EXT2_BASE).$(EXT2_ROOTFS_COMPRESSOR_EXT): $(EXT2_ROOTFS_COMPRESSOR_PREREQ) $(EXT2_BASE)

diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk
index d44f47bf4265b295d38294a515a06bfa2a7cc1cf..dcc0df1846a2b6a81f22c0bf3ced60d331049913 100644 (file)
--- a/target/initramfs/initramfs.mk
+++ b/target/initramfs/initramfs.mk
@@ -20,19 +20,19 @@ $(INITRAMFS_TARGET) initramfs: host-fakeroot makedevs
        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.$(notdir $(TAR_TARGET))
-       touch $(STAGING_DIR)/.fakeroot.00000
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
+       cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
        # Use fakeroot so gen_initramfs_list.sh  believes the previous fakery
        echo "$(CONFIG_SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $(INITRAMFS_TARGET)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       -rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       -rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 
 initramfs-source:
 

diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index 2f0286d6b8ac6c5240112810c04a775a0b67be06..1466a599d4c8097d5a1a1c256e0f4f7601d6a1d6 100644 (file)
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -62,17 +62,17 @@ $(ISO9660_TARGET): host-fakeroot $(LINUX_KERNEL) $(EXT2_TARGET) grub mkisofs
        cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel
        cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd
        # Use fakeroot to pretend all target binaries are owned by root
-       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
-       touch $(STAGING_DIR)/.fakeroot.00000
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
-       echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
+       rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
+       touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
+       cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
+       echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
        # Use fakeroot so mkisofs believes the previous fakery
        echo "$(MKISOFS_TARGET) -R -b boot/grub/stage2_eltorito -no-emul-boot " \
                "-boot-load-size 4 -boot-info-table -o $(ISO9660_TARGET) $(ISO9660_TARGET_DIR)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
-       -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
+       chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
+       -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET))
 
 iso9660root: $(ISO9660_TARGET)
        echo $(ISO9660_TARGET)

diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk
index 311a60029bdbcb537117a862235fcc3d9fe78d51..2d4a325a0c3295da8b47345976b9383d166c4a19 100644 (file)
--- a/target/jffs2/jffs2root.mk
+++ b/target/jffs2/jffs2root.mk
@@ -56,21 +56,21 @@ $(JFFS2_TARGET): host-fakeroot makedevs mtd-host
        @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
        -$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
-       touch $(STAGING_DIR)/.fakeroot.00000
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
-       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+       rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+       touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
+       cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
 endif
        # Use fakeroot so mkfs.jffs2 believes the previous fakery
        echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $(JFFS2_TARGET)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
-       -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+       chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
+       -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))
        @ls -l $(JFFS2_TARGET)
 ifeq ($(BR2_JFFS2_TARGET_SREC),y)
        $(TARGET_CROSS)objcopy -I binary -O srec --adjust-vma 0xa1000000 $(JFFS2_TARGET) $(JFFS2_TARGET).srec

diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk
index 3084aa08dadb604842087ce2c4d4fb29479817e9..7386a76f3737199bd7fa5aedc33fe060278cf505 100644 (file)
--- a/target/squashfs/squashfsroot.mk
+++ b/target/squashfs/squashfsroot.mk
@@ -49,23 +49,23 @@ squashfsroot: host-fakeroot makedevs squashfs
        @rm -rf $(TARGET_DIR)/usr/info
        $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
-       touch $(STAGING_DIR)/.fakeroot.00000
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
-       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+       rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+       touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
+       cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
 endif
        # Use fakeroot so mksquashfs believes the previous fakery
        echo "$(SQUASHFS_DIR)/squashfs-tools/mksquashfs " \
                    "$(TARGET_DIR) $(SQUASHFS_TARGET) " \
                    "-noappend $(SQUASHFS_ENDIANNESS)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
-       -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+       chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+       -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
 
 squashfsroot-source: squashfs-source
 

diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk
index 18293d7ecc99a8c45f6ac8a97ba693a13bf370f2..df40af19198b4902cf229b9b092277e22ffffba7 100644 (file)
--- a/target/tar/tarroot.mk
+++ b/target/tar/tarroot.mk
@@ -28,25 +28,25 @@ tarroot: host-fakeroot makedevs
        @rm -rf $(TARGET_DIR)/usr/info
        $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
        # Use fakeroot to pretend all target binaries are owned by root
-       rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       touch $(STAGING_DIR)/.fakeroot.00000
-       cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
+       cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 ifneq ($(TARGET_DEVICE_TABLE),)
        # Use fakeroot to pretend to create all needed device nodes
        echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 endif
        # Use fakeroot so tar believes the previous fakery
        echo "tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) ." \
-               >> $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
-       $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+               >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 ifneq ($(TAR_COMPRESSOR),)
        -rm -f $(TAR_TARGET).$()
        PATH="$(STAGING_DIR)/sbin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/usr/bin:$(PATH)" $(TAR_COMPRESSOR) $(TAR_TARGET) > $(TAR_TARGET).$(TAR_COMPRESSOR_EXT)
 endif
-       -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+       -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
 
 tarroot-source: