diff options
| author | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-08-16 18:19:42 +0000 |
|---|---|---|
| committer | Ulf Samuelsson <ulf.samuelsson@atmel.com> | 2007-08-16 18:19:42 +0000 |
| commit | 5d2be049791872cd2a66a4ef80bd22e199d9c876 (patch) | |
| tree | 1944db10e1a36e90fc53b1b40f6fff9a9350b052 /target/cpio | |
| parent | 0a9af49e0b41dc66ce0bb0d583b0241a882f2700 (diff) | |
Move fakeroot temps from STAGING_DIR to PROJECT_BUILD_DIR
Diffstat (limited to 'target/cpio')
| -rw-r--r-- | target/cpio/cpioroot.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index 7b14d2186..b2b4c4951 100644 --- 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) |