diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/cpio/cpioroot.mk | 18 | ||||
| -rw-r--r-- | target/cramfs/cramfs.mk | 18 | ||||
| -rw-r--r-- | target/device/Atmel/DataFlashBoot/DataflashBoot.mk | 6 | ||||
| -rw-r--r-- | target/device/Atmel/Makefile.in | 4 | ||||
| -rw-r--r-- | target/device/Atmel/at91bootstrap/at91bootstrap.mk | 6 | ||||
| -rw-r--r-- | target/device/Config.in | 2 | ||||
| -rw-r--r-- | target/device/KwikByte/Makefile.in | 4 | ||||
| -rw-r--r-- | target/ext2/ext2root.mk | 20 | ||||
| -rw-r--r-- | target/initramfs/initramfs.mk | 18 | ||||
| -rw-r--r-- | target/iso9660/iso9660.mk | 16 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 20 | ||||
| -rw-r--r-- | target/linux/Makefile.in | 6 | ||||
| -rw-r--r-- | target/linux/Makefile.in.advanced | 26 | ||||
| -rw-r--r-- | target/romfs/romfs.mk | 18 | ||||
| -rw-r--r-- | target/squashfs/squashfsroot.mk | 18 | ||||
| -rw-r--r-- | target/tar/tarroot.mk | 18 | ||||
| -rw-r--r-- | target/u-boot/Makefile.in | 17 | ||||
| -rw-r--r-- | target/ubifs/ubifsroot.mk | 18 |
18 files changed, 124 insertions, 129 deletions
diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index 0dbdb2eb4..2197d1050 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -40,21 +40,21 @@ cpioroot-init: $(CPIO_BASE): host-fakeroot makedevs cpioroot-init # Use fakeroot to pretend all target binaries are owned by root - rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - 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)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + >> $(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)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - #-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + #-@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) ifeq ($(CPIO_ROOTFS_COMPRESSOR),) ifneq ($(ROOTFS_CPIO_COPYTO),) $(Q)cp -f $(CPIO_BASE) $(ROOTFS_CPIO_COPYTO) diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 99f9f7989..79353b5ca 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -52,21 +52,21 @@ CRAMFS_TARGET=$(IMAGE).cramfs cramfsroot: host-fakeroot makedevs cramfs # Use fakeroot to pretend all target binaries are owned by root - 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)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) endif # Use fakeroot so mkcramfs believes the previous fakery echo "$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_OPTS) " \ - "$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) + "$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) + -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) cramfsroot-source: cramfs-source diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk index c3dc857d4..8939c2897 100644 --- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk +++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk @@ -8,16 +8,16 @@ DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION) ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR)) DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR) DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2 -DATAFLASHBOOT_DIR:=$(PROJECT_BUILD_DIR)/$(DATAFLASHBOOT_NAME) +DATAFLASHBOOT_DIR:=$(BUILD_DIR)/$(DATAFLASHBOOT_NAME) DATAFLASHBOOT_BINARY:=$(DATAFLASHBOOT_NAME).bin $(DL_DIR)/$(DATAFLASHBOOT_SOURCE): $(call DOWNLOAD,$(DATAFLASHBOOT_SITE),$(DATAFLASHBOOT_SOURCE)) $(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) - mkdir -p $(PROJECT_BUILD_DIR) + mkdir -p $(BUILD_DIR) ls $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) - $(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - + $(BZCAT) $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(DATAFLASHBOOT_DIR)/.unpacked $(DATAFLASHBOOT_DIR)/$(DATAFLASHBOOT_BINARY): $(DATAFLASHBOOT_DIR)/.unpacked diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index bb0352985..bf7a2d108 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -38,7 +38,7 @@ LINUX26_RC_PATCH:=$(call qstrip,$(BR2_LINUX26_RC_PATCH)) LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config # This should be part of target/linux/Makefile.in -LINUX26_BUILD_DIR:=$(PROJECT_BUILD_DIR) +LINUX26_BUILD_DIR:=$(BUILD_DIR) #LINUX26_BINLOC=$(LINUX26_FORMAT) #LINUX26_BINLOC:=$(BINARIES_DIR)/$(LINUX26_KERNEL) @@ -80,7 +80,7 @@ include $(ATMEL_PATH)/at91bootstrap/at91bootstrap.mk endif atmel_status: - @echo PROJECT_BUILD_DIR=$(PROJECT_BUILD_DIR) + @echo BUILD_DIR=$(BUILD_DIR) @echo BOARD_NAME=$(BOARD_NAME) @echo BR2_BOARD_PATH=$(BR2_BOARD_PATH) @echo BR2_MAJOR_MINOR=$(BR2_LINUX_MAJOR_VERSION)$(BR2_LINUX_MINOR_VERSION) diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index 92da683da..32ed3e2f6 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -10,7 +10,7 @@ AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR)) AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR) AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2 -AT91BOOTSTRAP_DIR:=$(PROJECT_BUILD_DIR)/$(AT91BOOTSTRAP_NAME) +AT91BOOTSTRAP_DIR:=$(BUILD_DIR)/$(AT91BOOTSTRAP_NAME) AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP)) AT91BOOTSTRAP_ZCAT:=$(BZCAT) @@ -37,8 +37,8 @@ $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): $(call DOWNLOAD,$(AT91BOOTSTRAP_SITE),$(AT91BOOTSTRAP_SOURCE)) $(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) - mkdir -p $(PROJECT_BUILD_DIR) - $(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - + mkdir -p $(BUILD_DIR) + $(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch touch $(AT91BOOTSTRAP_DIR)/.unpacked diff --git a/target/device/Config.in b/target/device/Config.in index 0e6e09aaf..6b7f11aa3 100644 --- a/target/device/Config.in +++ b/target/device/Config.in @@ -1,7 +1,5 @@ menu "Target options" -source "project/Config.in" - comment "Preset Devices" source "target/device/ARMLTD/Config.in" diff --git a/target/device/KwikByte/Makefile.in b/target/device/KwikByte/Makefile.in index d889bc258..1f0b60b8f 100644 --- a/target/device/KwikByte/Makefile.in +++ b/target/device/KwikByte/Makefile.in @@ -20,7 +20,7 @@ LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux.config endif # This should be part of target/linux/Makefile.in -LINUX26_BUILD_DIR:=$(PROJECT_BUILD_DIR) +LINUX26_BUILD_DIR:=$(BUILD_DIR) LINUX26_BINLOC=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) @@ -38,7 +38,7 @@ endif # Needs to be AFTER board specific Makefiles kwikbyte_status: - @echo PROJECT_BUILD_DIR=$(PROJECT_BUILD_DIR) + @echo BUILD_DIR=$(BUILD_DIR) @echo BOARD_NAME=$(BOARD_NAME) @echo BR2_BOARD_PATH=$(BR2_BOARD_PATH) @echo MAJOR_MINOR=$(LINUX_MAJOR_VER)$(LINUX_MINOR_VER) diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index 11624cf11..49b53f448 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -87,14 +87,14 @@ endif $(EXT2_BASE): host-fakeroot makedevs genext2fs # Use fakeroot to pretend all target binaries are owned by root - 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)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) endif # Use fakeroot so genext2fs believes the previous fakery ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) @@ -106,14 +106,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)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + "$(EXT2_OPTS) $(EXT2_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) else echo "$(GENEXT2_DIR)/genext2fs -d $(TARGET_DIR) " \ - "$(EXT2_OPTS) $(EXT2_BASE)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + "$(EXT2_OPTS) $(EXT2_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) endif - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) - -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + -@rm -f $(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 195a92904..0030278c5 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -18,19 +18,19 @@ $(INITRAMFS_TARGET) initramfs: host-fakeroot makedevs rm -f $(TARGET_DIR)/init ln -s sbin/init $(TARGET_DIR)/init # Use fakeroot to pretend all target binaries are owned by root - 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)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) # Use fakeroot so gen_initramfs_list.sh believes the previous fakery echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $(INITRAMFS_TARGET)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - -rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + -rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) initramfs-source: diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index 4dfa1adf8..94edf6363 100644 --- a/target/iso9660/iso9660.mk +++ b/target/iso9660/iso9660.mk @@ -60,17 +60,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 $(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)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) + echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(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)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) + -@rm -f $(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 9d6734790..7d31417ee 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -46,28 +46,28 @@ endif # $(JFFS2_TARGET): host-fakeroot makedevs mtd-host # Use fakeroot to pretend all target binaries are owned by root - 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)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) endif # Use fakeroot so mkfs.jffs2 believes the previous fakery ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),) echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $(JFFS2_TARGET).nosummary && " \ "$(SUMTOOL) $(SUMTOOL_OPTS) -i $(JFFS2_TARGET).nosummary -o $(JFFS2_TARGET) && " \ "rm $(JFFS2_TARGET).nosummary" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) else echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $(JFFS2_TARGET)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) endif - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) - -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + -@rm -f $(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/linux/Makefile.in b/target/linux/Makefile.in index 742fe1942..cf430d96b 100644 --- a/target/linux/Makefile.in +++ b/target/linux/Makefile.in @@ -69,7 +69,7 @@ LINUX26_KERNEL_NAME=$(BINARIES_DIR)/$(LINUX26_FORMAT)$(ROOTFS_STRIPPED_SUFFIX) endif # Version of Linux AFTER patches -LINUX26_DIR=$(PROJECT_BUILD_DIR)/linux-$(LINUX26_VERSION) +LINUX26_DIR=$(BUILD_DIR)/linux-$(LINUX26_VERSION) # for packages that need it LINUX_VERSION:=$(LINUX26_VERSION) @@ -106,10 +106,10 @@ endif # ($(LINUX26_VERSION),$(LINUX_HEADERS_VERSION)) $(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE) rm -rf $(LINUX26_DIR) @echo "*** Unpacking kernel source" - $(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - + $(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION)) # Rename the dir from the downloaded version to the AFTER patch version - mv -f $(PROJECT_BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR) + mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR) endif touch $@ diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced index 9de47350a..b4774ca23 100644 --- a/target/linux/Makefile.in.advanced +++ b/target/linux/Makefile.in.advanced @@ -48,7 +48,7 @@ BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH)) endif # Version of Linux AFTER patches -LINUX26_DIR:=$(PROJECT_BUILD_DIR)/linux-$(LINUX26_VERSION) +LINUX26_DIR:=$(BUILD_DIR)/linux-$(LINUX26_VERSION) # for packages that need it LINUX_VERSION:=$(LINUX26_VERSION) @@ -132,7 +132,7 @@ endif # -------------- # UIMAGE ifeq ($(LINUX26_FORMAT),uImage) -LINUX26_MKIMAGE_DIR:=$(PROJECT_BUILD_DIR)/u-boot-tools +LINUX26_MKIMAGE_DIR:=$(BUILD_DIR)/u-boot-tools LINUX26_MKIMAGE_DEP:=$(LINUX26_MKIMAGE_DIR)/mkimage ifeq ($(LINUX26_BINLOC),) LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT) @@ -200,17 +200,17 @@ endif $(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE) rm -rf $(LINUX26_DIR) @echo "*** Unpacking kernel source" - $(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - + $(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(DOWNLOAD_LINUX26_VERSION),$(LINUX26_VERSION)) # Rename the dir from the downloaded version to the AFTER patch version - mv -f $(PROJECT_BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR) - echo $(LINUX26_VERSION_PROBED) > $(PROJECT_BUILD_DIR)/.linux-version + mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX26_VERSION) $(LINUX26_DIR) + echo $(LINUX26_VERSION_PROBED) > $(BUILD_DIR)/.linux-version endif touch $@ # ----------------------------------------------------------------------------- -LINUX26_TARGETS+=$(LINUX26_KERNEL) $(PROJECT_BUILD_DIR)/.linux-version +LINUX26_TARGETS+=$(LINUX26_KERNEL) $(BUILD_DIR)/.linux-version ifeq ($(BR2_LINUX_COPYTO_ROOTFS),y) LINUX26_TARGETS+=$(TARGET_DIR)/boot/$(LINUX26_KERNEL_NAME) @@ -381,7 +381,7 @@ $(LINUX26_KERNEL): $(LINUX26_DIR)/$(LINUX26_BINLOC) touch $@ # ----------------------------------------------------------------------------- -$(PROJECT_BUILD_DIR)/autotools-stamps/linux_modules_target_installed: $(LINUX26_DIR)/.depend_done +$(STAMP_DIR)/linux_modules_target_installed: $(LINUX26_DIR)/.depend_done rm -rf $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION_PROBED) rm -f $(TARGET_DIR)/sbin/cardmgr # Make Linux depend on modules only if enabled in the .config. @@ -441,8 +441,8 @@ $(LINUX_COPYTO)/$(LINUX26_KERNEL_NAME): $(LINUX26_KERNEL) touch $@ endif -$(PROJECT_BUILD_DIR)/.linux-version: $(LINUX26_KERNEL) - echo $(LINUX26_VERSION_PROBED) > $(PROJECT_BUILD_DIR)/.linux-version +$(BUILD_DIR)/.linux-version: $(LINUX26_KERNEL) + echo $(LINUX26_VERSION_PROBED) > $(BUILD_DIR)/.linux-version echo LINUX_MODULES=`$(LINUX26_VERSION_PROBED)` $(LINUX26_MKIMAGE_DIR)/mkimage: $(U_BOOT_TOOLS) @@ -451,9 +451,9 @@ $(LINUX26_MKIMAGE_DIR)/mkimage: $(U_BOOT_TOOLS) linux26: $(LINUX26_TARGETS) -linux26-version: $(PROJECT_BUILD_DIR)/.linux-version +linux26-version: $(BUILD_DIR)/.linux-version -linux26-modules: cross-depmod26 $(PROJECT_BUILD_DIR)/autotools-stamps/linux_modules_target_installed +linux26-modules: cross-depmod26 $(STAMP_DIR)/linux_modules_target_installed linux26-source: $(DL_DIR)/$(LINUX26_SOURCE) @@ -470,7 +470,7 @@ linux26-force: # This has been renamed so we do _NOT_ by default run this on 'make clean' linux26clean: - rm -f $(PROJECT_BUILD_DIR)/autotools-stamps/linux_modules_target_installed + rm -f $(STAMP_DIR)/linux_modules_target_installed rm -f $(LINUX26_KERNEL) $(LINUX26_DIR)/.configured -$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX26_DIR) clean @@ -531,7 +531,7 @@ linux-status: @echo LINUX26_TARGETS=$(LINUX26_TARGETS) @echo LINUX26_VERSION=$(LINUX26_VERSION) @echo LINUX26_MAKE_FLAGS=$(LINUX26_MAKE_FLAGS) - @echo PROJECT_BUILD_DIR=$(PROJECT_BUILD_DIR) + @echo BUILD_DIR=$(BUILD_DIR) @echo TARGETS=$(TARGETS) endif diff --git a/target/romfs/romfs.mk b/target/romfs/romfs.mk index 2e2470b4b..6e7fbeedd 100644 --- a/target/romfs/romfs.mk +++ b/target/romfs/romfs.mk @@ -38,20 +38,20 @@ ROMFS_TARGET=$(IMAGE).romfs romfsroot: host-fakeroot makedevs romfs # Use fakeroot to pretend all target binaries are owned by root - rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 - cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) endif # Use fakeroot so genromfs believes the previous fakery - echo "$(ROMFS_DIR)/genromfs -d $(TARGET_DIR) -f $(ROMFS_TARGET)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + echo "$(ROMFS_DIR)/genromfs -d $(TARGET_DIR) -f $(ROMFS_TARGET)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) romfsroot-source: romfs-source diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index 3ff0f3bc3..ebb0cd2bd 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -48,24 +48,24 @@ SQUASHFS_TARGET:=$(IMAGE).squashfs squashfsroot: host-fakeroot makedevs squashfs # Use fakeroot to pretend all target binaries are owned by root - 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)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) + >> $(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)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) chmod 0644 $(SQUASHFS_TARGET) - -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) + -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) squashfsroot-source: squashfs-source diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk index a62f5bf65..a7e95df98 100644 --- a/target/tar/tarroot.mk +++ b/target/tar/tarroot.mk @@ -25,20 +25,20 @@ ROOTFS_TAR_COPYTO:=$(call qstrip,$(BR2_TARGET_ROOTFS_TAR_COPYTO)) tarroot: host-fakeroot makedevs # Use fakeroot to pretend all target binaries are owned by root - 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)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + >> $(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) ." \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(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) @@ -46,7 +46,7 @@ endif ifneq ($(ROOTFS_TAR_COPYTO),) $(Q)cp -f $(TAR_TARGET) $(ROOTFS_TAR_COPYTO) endif - -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) tarroot-source: diff --git a/target/u-boot/Makefile.in b/target/u-boot/Makefile.in index 3dc78b165..69877378e 100644 --- a/target/u-boot/Makefile.in +++ b/target/u-boot/Makefile.in @@ -8,11 +8,11 @@ U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION)) U_BOOT_SOURCE:=u-boot-$(U_BOOT_VERSION).tar.bz2 U_BOOT_SITE:=$(call qstrip,$(BR2_U_BOOT_SITE)) -U_BOOT_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION) -U_BOOT_PATCH_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches +U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION) +U_BOOT_PATCH_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)-patches U_BOOT_CAT:=$(BZCAT) U_BOOT_BIN:=u-boot.bin -U_BOOT_TARGET_BIN:=$(PROJECT)-u-boot-$(U_BOOT_VERSION)-$(DATE).bin +U_BOOT_TARGET_BIN:=u-boot-$(U_BOOT_VERSION)-$(DATE).bin U_BOOT_TOOLS_BIN:=mkimage U_BOOT_TOOLS:=$(STAGING_DIR)/usr/bin/$(U_BOOT_TOOLS_BIN) @@ -66,7 +66,7 @@ $(DL_DIR)/$(U_BOOT_SOURCE): $(U_BOOT_DIR)/.unpacked: $(DL_DIR)/$(U_BOOT_SOURCE) $(U_BOOT_CAT) $(DL_DIR)/$(U_BOOT_SOURCE) \ - | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - + | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - mkdir -p $(U_BOOT_DIR) touch $@ @@ -102,9 +102,6 @@ ifdef BR2_TARGET_UBOOT_DEFAULT_ENV @echo "#define __BR2_ADDED_CONFIG_H" >> $(U_BOOT_INC_CONF_FILE) $(call insert_define, DATE, $(DATE)) $(call insert_define, CONFIG_LOAD_SCRIPTS, 1) -ifneq ($(strip $(BR2_PROJECT)),"") - $(call insert_define, CONFIG_HOSTNAME, $(BR2_PROJECT)) -endif endif # BR2_TARGET_UBOOT_DEFAULT_ENV ifdef BR2_TARGET_UBOOT_NETWORK ifneq ($(strip $(BR2_TARGET_UBOOT_IPADDR)),"") @@ -194,7 +191,7 @@ $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/$(U_BOOT_BIN) u-boot: $(U_BOOT_TARGETS) -u-boot-autoscript: $(U_BOOT_AUTOSCRIPT).$(PROJECT) +u-boot-autoscript: $(U_BOOT_AUTOSCRIPT).img u-boot-clean: -$(MAKE) -C $(U_BOOT_DIR) clean @@ -249,7 +246,7 @@ endif echo setargs >> $(U_BOOT_AUTOSCRIPT) echo saveenv >> $(U_BOOT_AUTOSCRIPT) -$(U_BOOT_AUTOSCRIPT).$(PROJECT): $(U_BOOT_AUTOSCRIPT) $(MKIMAGE) +$(U_BOOT_AUTOSCRIPT).img: $(U_BOOT_AUTOSCRIPT) $(MKIMAGE) $(MKIMAGE) -A $(ARCH) \ -O linux \ -T script \ @@ -258,7 +255,7 @@ $(U_BOOT_AUTOSCRIPT).$(PROJECT): $(U_BOOT_AUTOSCRIPT) $(MKIMAGE) -e 0 \ -n "autoscr config" \ -d $(U_BOOT_AUTOSCRIPT) \ - $(U_BOOT_AUTOSCRIPT).$(PROJECT) + $(U_BOOT_AUTOSCRIPT).img diff --git a/target/ubifs/ubifsroot.mk b/target/ubifs/ubifsroot.mk index c09c9819e..e73d4f926 100644 --- a/target/ubifs/ubifsroot.mk +++ b/target/ubifs/ubifsroot.mk @@ -77,21 +77,21 @@ endif $(UBIFS_BASE): host-fakeroot makedevs mkfs.ubifs # Use fakeroot to pretend all target binaries are owned by root - rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - touch $(PROJECT_BUILD_DIR)/.fakeroot.00000 - cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) ifneq ($(TARGET_DEVICE_TABLE),) # Use fakeroot to pretend to create all needed device nodes echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) endif # Use fakeroot so mkfs.ubifs believes the previous fakery echo "$(MKFS_UBIFS_DIR)/mkfs.ubifs -d $(TARGET_DIR) " \ - "$(UBIFS_OPTS) -o $(UBIFS_BASE)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + "$(UBIFS_OPTS) -o $(UBIFS_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) ifneq ($(UBIFS_ROOTFS_COMPRESSOR),) $(UBIFS_BASE).$(UBIFS_ROOTFS_COMPRESSOR_EXT): $(UBIFS_ROOTFS_COMPRESSOR_PREREQ) $(UBIFS_BASE) |