From 5d2be049791872cd2a66a4ef80bd22e199d9c876 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Thu, 16 Aug 2007 18:19:42 +0000 Subject: Move fakeroot temps from STAGING_DIR to PROJECT_BUILD_DIR --- target/jffs2/jffs2root.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'target/jffs2') diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 311a60029..2d4a325a0 100644 --- 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 -- cgit v1.2.3