From de08c1f8f268e768669564370e4b9a17276e286a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 31 Oct 2020 23:28:32 +0100 Subject: [PATCH] - rename $(BUILD_TMP) => $(BUILD_DIR) --- make/bootstrap.mk | 6 +++--- make/clean.mk | 2 +- make/crosstool.mk | 12 ++++++------ make/environment-build.mk | 20 ++++++++++---------- make/environment-image.mk | 2 +- make/environment-linux.mk | 24 ++++++++++++------------ make/environment-update.mk | 2 +- make/helpers.mk | 11 ++++++----- make/host-tools.mk | 6 +++--- make/image-updates.mk | 2 +- make/images.mk | 10 +++++----- make/linux-drivers.mk | 6 +++--- make/linux-kernel.mk | 8 ++++---- make/neutrino-plugins.mk | 2 +- make/neutrino.mk | 4 ++-- make/target-blobs.mk | 12 ++++++------ make/target-development.mk | 2 +- make/target-ffmpeg-coolstream.mk | 2 +- make/target-libs.mk | 4 ++-- make/target-tools-unused.mk | 2 +- make/target-tools.mk | 26 +++++++++++++------------- 21 files changed, 83 insertions(+), 82 deletions(-) diff --git a/make/bootstrap.mk b/make/bootstrap.mk index de9954d5..1e2fcc38 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -7,7 +7,7 @@ BOOTSTRAP = $(CROSS_DIR) BOOTSTRAP += $(STATIC_DIR) BOOTSTRAP += $(DEPS_DIR) -BOOTSTRAP += $(BUILD_TMP) +BOOTSTRAP += $(BUILD_DIR) BOOTSTRAP += $(STAGING_DIR) BOOTSTRAP += $(IMAGE_DIR) BOOTSTRAP += $(UPDATE_DIR) @@ -25,7 +25,7 @@ endif # ----------------------------------------------------------------------------- bootstrap: $(BOOTSTRAP) - @touch $(BUILD_TMP)/.$(BOXTYPE)-$(BOXMODEL) + @touch $(BUILD_DIR)/.$(BOXTYPE)-$(BOXMODEL) $(call draw_line); @echo -e "$(TERM_YELLOW)Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))$(TERM_NORMAL)" $(call draw_line); @@ -83,7 +83,7 @@ $(TARGET_DIR): $(STATIC_DIR) \ $(DEPS_DIR) \ -$(BUILD_TMP) \ +$(BUILD_DIR) \ $(STAGING_DIR) \ $(IMAGE_DIR) \ $(UPDATE_DIR): diff --git a/make/clean.mk b/make/clean.mk index 1ab939a7..c5348b3e 100644 --- a/make/clean.mk +++ b/make/clean.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- build-clean: - -rm -rf $(BUILD_TMP) + -rm -rf $(BUILD_DIR) cross-base-clean: -rm -rf $(CROSS_BASE) diff --git a/make/crosstool.mk b/make/crosstool.mk index bb37508b..892b7db8 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -45,12 +45,12 @@ crosstools-renew: # ----------------------------------------------------------------------------- # wrapper for manually call -kernel-tarball: $(BUILD_TMP)/linux-$(KERNEL_VER).tar +kernel-tarball: $(BUILD_DIR)/linux-$(KERNEL_VER).tar # create kernel-tarball -$(BUILD_TMP)/linux-$(KERNEL_VER).tar: | $(BUILD_TMP) +$(BUILD_DIR)/linux-$(KERNEL_VER).tar: | $(BUILD_DIR) $(MAKE) kernel.do_prepare.$(if $(filter $(KERNEL_SOURCE),git),git,tar) - tar cf $(@) --exclude-vcs -C $(BUILD_TMP)/$(KERNEL_TMP) . + tar cf $(@) --exclude-vcs -C $(BUILD_DIR)/$(KERNEL_TMP) . # ----------------------------------------------------------------------------- @@ -81,8 +81,8 @@ UCLIBC_VER = 1.0.24 # crosstool for arm-hd2 depends on gcc-linaro $(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC-LINARO_SOURCE) -$(CROSS_DIR): | $(BUILD_TMP) - make $(BUILD_TMP)/linux-$(KERNEL_VER).tar +$(CROSS_DIR): | $(BUILD_DIR) + make $(BUILD_DIR)/linux-$(KERNEL_VER).tar # $(REMOVE)/$(CROSSTOOL-NG_TMP) $(GET-GIT-SOURCE) $(CROSSTOOL-NG_SITE)/$(CROSSTOOL-NG_SOURCE) $(DL_DIR)/$(CROSSTOOL-NG_SOURCE) @@ -103,7 +103,7 @@ endif export NI_LOCAL_TARBALLS_DIR=$(DL_DIR); \ export NI_PREFIX_DIR=$(@); \ export NI_KERNEL_VERSION=$(KERNEL_VER); \ - export NI_KERNEL_LOCATION=$(BUILD_TMP)/linux-$(KERNEL_VER).tar; \ + export NI_KERNEL_LOCATION=$(BUILD_DIR)/linux-$(KERNEL_VER).tar; \ export NI_LIBC_UCLIBC_CONFIG_FILE=$(CONFIGS)/ct-ng-uClibc-$(UCLIBC_VER).config; \ export LD_LIBRARY_PATH=; \ test -f ./configure || ./bootstrap; \ diff --git a/make/environment-build.mk b/make/environment-build.mk index d2b5fb2e..e61ba83c 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -31,10 +31,10 @@ BASE_DIR := $(shell pwd) MAINTAINER ?= unknown WHOAMI := $(shell id -un) DL_DIR = $(BASE_DIR)/download -BUILD_TMP = $(BASE_DIR)/build_tmp -ROOTFS = $(BUILD_TMP)/rootfs +BUILD_DIR = $(BASE_DIR)/build_tmp +ROOTFS = $(BUILD_DIR)/rootfs ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x)) - ROOTFS = $(BUILD_TMP)/rootfs/linuxrootfs1 + ROOTFS = $(BUILD_DIR)/rootfs/linuxrootfs1 endif DEPS_DIR = $(BASE_DIR)/deps D = $(DEPS_DIR) @@ -74,7 +74,7 @@ PKG_VER = $($(PKG_UPPER)_VER) PKG_TMP = $($(PKG_UPPER)_TMP) PKG_SOURCE = $($(PKG_UPPER)_SOURCE) PKG_SITE = $($(PKG_UPPER)_SITE) -PKG_BUILD_TMP = $(BUILD_TMP)/$(PKG_TMP) +PKG_BUILD_TMP = $(BUILD_DIR)/$(PKG_TMP) PKG_PATCHES_DIR = $(PATCHES)/$(subst host-,,$(PKG_NAME)) # ----------------------------------------------------------------------------- @@ -212,20 +212,20 @@ PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR) # unpack archives into build directory -UNTAR = tar -C $(BUILD_TMP) -xf $(DL_DIR) -UNZIP = unzip -d $(BUILD_TMP) -o $(DL_DIR) +UNTAR = tar -C $(BUILD_DIR) -xf $(DL_DIR) +UNZIP = unzip -d $(BUILD_DIR) -o $(DL_DIR) # clean up -REMOVE = rm -rf $(BUILD_TMP) +REMOVE = rm -rf $(BUILD_DIR) # apply patches PATCH = patch -p1 -i $(PATCHES) # build helper variables CD = set -e; cd -CHDIR = $(CD) $(BUILD_TMP) -MKDIR = mkdir -p $(BUILD_TMP) -CPDIR = cp -a -t $(BUILD_TMP) $(DL_DIR) +CHDIR = $(CD) $(BUILD_DIR) +MKDIR = mkdir -p $(BUILD_DIR) +CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR) #TOUCH = @touch $(DEPS_DIR)/$(@) TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@) diff --git a/make/environment-image.mk b/make/environment-image.mk index 0f75a978..7cb26e7f 100644 --- a/make/environment-image.mk +++ b/make/environment-image.mk @@ -63,7 +63,7 @@ endif IMAGE_SITE = $(NI-SERVER)/$(NI-SUBDIR) IMAGE_MD5FILE = $(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt -IMAGE_BUILD_TMP = $(BUILD_TMP)/image-build +IMAGE_BUILD_TMP = $(BUILD_DIR)/image-build ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo)) IMAGE_SUBDIR = $(subst vu,vuplus/,$(BOXMODEL)) diff --git a/make/environment-linux.mk b/make/environment-linux.mk index ddffaca9..5cb1cf95 100644 --- a/make/environment-linux.mk +++ b/make/environment-linux.mk @@ -34,7 +34,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) KERNEL_SITE = http://downloads.mutant-digital.net KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/bcm7445-bcm97445svmb.dtb + KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/bcm7445-bcm97445svmb.dtb KERNEL_CONFIG = $(CONFIGS)/kernel-hd5x.config BOOT_PARTITION = 1 @@ -47,7 +47,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60)) KERNEL_SITE = http://source.mynonpublic.com/gfutures KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/hi3798mv200.dtb + KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/hi3798mv200.dtb KERNEL_CONFIG = $(CONFIGS)/kernel-hd6x.config BOOT_PARTITION = 4 @@ -60,7 +60,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd61)) KERNEL_SITE = http://source.mynonpublic.com/gfutures KERNEL_BRANCH = $(EMPTY) - KERNEL_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/hi3798mv200.dtb + KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/dts/hi3798mv200.dtb KERNEL_CONFIG = $(CONFIGS)/kernel-hd6x.config BOOT_PARTITION = 4 @@ -198,30 +198,30 @@ KERNEL_NAME = NI $(shell echo $(BOXFAMILY) | sed 's/.*/\u&/') Kernel # ----------------------------------------------------------------------------- -KERNEL_MODULES_DIR = $(BUILD_TMP)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VER) +KERNEL_MODULES_DIR = $(BUILD_DIR)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VER) ifeq ($(BOXMODEL), nevis) - KERNEL_UIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image + KERNEL_UIMAGE = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image else - KERNEL_UIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/uImage + KERNEL_UIMAGE = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/uImage endif -KERNEL_ZIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage -KERNEL_ZIMAGE_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage_dtb -KERNEL_VMLINUX = $(BUILD_TMP)/$(KERNEL_OBJ)/vmlinux +KERNEL_ZIMAGE = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage +KERNEL_ZIMAGE_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage_dtb +KERNEL_VMLINUX = $(BUILD_DIR)/$(KERNEL_OBJ)/vmlinux # ----------------------------------------------------------------------------- KERNEL_MAKEVARS = \ ARCH=$(BOXARCH) \ CROSS_COMPILE=$(TARGET_CROSS) \ - INSTALL_MOD_PATH=$(BUILD_TMP)/$(KERNEL_MODULES) \ + INSTALL_MOD_PATH=$(BUILD_DIR)/$(KERNEL_MODULES) \ LOCALVERSION= \ - O=$(BUILD_TMP)/$(KERNEL_OBJ) + O=$(BUILD_DIR)/$(KERNEL_OBJ) # Compatibility variables KERNEL_MAKEVARS += \ KVER=$(KERNEL_VER) \ - KSRC=$(BUILD_TMP)/$(KERNEL_TMP) + KSRC=$(BUILD_DIR)/$(KERNEL_TMP) ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo)) KERNEL_IMAGE = vmlinux diff --git a/make/environment-update.mk b/make/environment-update.mk index 5d0fb019..34ad8820 100644 --- a/make/environment-update.mk +++ b/make/environment-update.mk @@ -3,7 +3,7 @@ # # ----------------------------------------------------------------------------- -UPDATE_TEMP_DIR = $(BUILD_TMP)/temp_inst +UPDATE_TEMP_DIR = $(BUILD_DIR)/temp_inst UPDATE_INST_DIR = $(UPDATE_TEMP_DIR)/inst UPDATE_CTRL_DIR = $(UPDATE_TEMP_DIR)/ctrl diff --git a/make/helpers.mk b/make/helpers.mk index afb74be0..01e53916 100644 --- a/make/helpers.mk +++ b/make/helpers.mk @@ -6,7 +6,7 @@ # execute local scripts define local-script @if [ -x $(LOCAL_DIR)/scripts/$(1) ]; then \ - $(LOCAL_DIR)/scripts/$(1) $(2) $(TARGET_DIR) $(BUILD_TMP); \ + $(LOCAL_DIR)/scripts/$(1) $(2) $(TARGET_DIR) $(BUILD_DIR); \ fi endef @@ -65,6 +65,7 @@ define rewrite_libtool $(REWRITE_LIBTOOL)/$${la}; \ echo -e "\n# Adapted to buildsystem\n$(REWRITE_LIBTOOL_TAG)" >> $${la}; \ fi; \ + done endef # rewrite libtool libraries automatically @@ -178,8 +179,8 @@ endef # ----------------------------------------------------------------------------- archives-list: - @rm -f $(BUILD_TMP)/$(@) - @make -qp | grep --only-matching '^\$(DL_DIR).*:' | sed "s|:||g" > $(BUILD_TMP)/$(@) + @rm -f $(BUILD_DIR)/$(@) + @make -qp | grep --only-matching '^\$(DL_DIR).*:' | sed "s|:||g" > $(BUILD_DIR)/$(@) DOCLEANUP ?= no GETMISSING ?= no @@ -209,7 +210,7 @@ archives-info: archives-list @echo "[ ** ] Unused archives" @find $(DL_DIR)/ -maxdepth 1 -type f | \ while read archive; do \ - if ! grep -q $$archive $(BUILD_TMP)/archives-list; then \ + if ! grep -q $$archive $(BUILD_DIR)/archives-list; then \ echo -e "[$(TERM_YELLOW) rm $(TERM_NORMAL)] $$archive"; \ if [ "$(DOCLEANUP)" = "yes" ]; then \ rm $$archive; \ @@ -217,7 +218,7 @@ archives-info: archives-list fi; \ done; @echo "[ ** ] Missing archives" - @cat $(BUILD_TMP)/archives-list | \ + @cat $(BUILD_DIR)/archives-list | \ while read archive; do \ if [ -e $$archive ]; then \ #echo -e "[$(TERM_GREEN) ok $(TERM_NORMAL)] $$archive"; \ diff --git a/make/host-tools.mk b/make/host-tools.mk index cd66aee4..061540d0 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -138,7 +138,7 @@ $(HOST_DIR)/bin/mkimage: $(DL_DIR)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR) $(MAKE) defconfig; \ $(MAKE) silentoldconfig; \ $(MAKE) tools-only - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_U-BOOT_TMP)/tools/mkimage $(HOST_DIR)/bin/ + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_U-BOOT_TMP)/tools/mkimage $(HOST_DIR)/bin/ $(REMOVE)/$(HOST_U-BOOT_TMP) # ----------------------------------------------------------------------------- @@ -168,7 +168,7 @@ host-zic: $(DL_DIR)/$(HOST_TZDATA_SOURCE) $(DL_DIR)/$(HOST_TZCODE_SOURCE) | $(HO tar -xf $(DL_DIR)/$(HOST_TZCODE_SOURCE); \ tar -xf $(DL_DIR)/$(HOST_TZDATA_SOURCE); \ $(MAKE) zic - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_TZCODE_TMP)/zic $(HOST_ZIC) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_TZCODE_TMP)/zic $(HOST_ZIC) $(REMOVE)/$(HOST_TZCODE_TMP) $(TOUCH) @@ -296,7 +296,7 @@ host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR) -DCMAKE_INSTALL_PREFIX="" \ ; \ $(MAKE) - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_NINJA_TMP)/ninja $(HOST_DIR)/bin/ninja + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_NINJA_TMP)/ninja $(HOST_DIR)/bin/ninja $(REMOVE)/$(HOST_NINJA_TMP) $(TOUCH) diff --git a/make/image-updates.mk b/make/image-updates.mk index dbe75f15..b3298715 100644 --- a/make/image-updates.mk +++ b/make/image-updates.mk @@ -197,7 +197,7 @@ u-clean-all: u-clean rm -rf $(UPDATE_DIR) u-update-bin: - $(CD) $(BUILD_TMP); \ + $(CD) $(BUILD_DIR); \ tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst echo $(UPDATE_SITE)/$(UPDATE_NAME).bin $(UPDATE_TYPE)$(UPDATE_VER)$(UPDATE_DATE) `md5sum $(UPDATE_DIR)/$(UPDATE_NAME).bin | cut -c1-32` $(UPDATE_DESC) $(UPDATE_VERSION) >> $(UPDATE_DIR)/$(UPDATE_MD5FILE) $(MAKE) u-clean diff --git a/make/images.mk b/make/images.mk index cd1aac1b..6cf3a47a 100644 --- a/make/images.mk +++ b/make/images.mk @@ -3,7 +3,7 @@ # # ----------------------------------------------------------------------------- -MKFSFLAGS = -U -D $(BUILD_TMP)/devtable-$(BOXSERIES).txt -r $(ROOTFS) +MKFSFLAGS = -U -D $(BUILD_DIR)/devtable-$(BOXSERIES).txt -r $(ROOTFS) ifeq ($(BOXSERIES), hd1) MKFSFLAGS += -p endif @@ -20,9 +20,9 @@ endif # ----------------------------------------------------------------------------- -devtable: $(BUILD_TMP)/devtable-$(BOXSERIES).txt +devtable: $(BUILD_DIR)/devtable-$(BOXSERIES).txt -$(BUILD_TMP)/devtable-hd1.txt: +$(BUILD_DIR)/devtable-hd1.txt: # echo "/dev/pts d 755 0 0 - - - - -" > $(@) echo "/dev/shm d 755 0 0 - - - - -" >> $(@) @@ -33,7 +33,7 @@ $(BUILD_TMP)/devtable-hd1.txt: echo "/dev/mtd c 640 0 0 90 0 0 2 6" >> $(@) echo "/dev/mtdblock b 640 0 0 31 0 0 1 6" >> $(@) -$(BUILD_TMP)/devtable-hd2.txt: +$(BUILD_DIR)/devtable-hd2.txt: # echo "/dev/pts d 755 0 0 - - - - -" > $(@) echo "/dev/shm d 755 0 0 - - - - -" >> $(@) @@ -257,7 +257,7 @@ flash-image-vuplus-multi: | $(IMAGE_DIR) rm -rf $(IMAGE_BUILD_TMP) mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash_auto.bin - cp $(BUILD_TMP)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/initrd_auto.bin + cp $(BUILD_DIR)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/initrd_auto.bin echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel_auto.bin cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel1_auto.bin cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel2_auto.bin diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index d4a1be7a..1a86d7ba 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -31,7 +31,7 @@ $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE): HD6x-MALI-DRIVERS_PATCH = hi3798mv200-support.patch HD6x-MALI-DRIVERS_MAKEVARS = \ - M=$(BUILD_TMP)/$(HD6x-MALI-DRIVERS_TMP)/driver/src/devicedrv/mali \ + M=$(BUILD_DIR)/$(HD6x-MALI-DRIVERS_TMP)/driver/src/devicedrv/mali \ EXTRA_CFLAGS="-DCONFIG_MALI_DVFS=y -DCONFIG_GPU_AVS_ENABLE=y" \ CONFIG_MALI_SHARED_INTERRUPTS=y \ CONFIG_MALI400=m \ @@ -45,8 +45,8 @@ hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x-MALI- $(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE) $(CHDIR)/$(HD6x-MALI-DRIVERS_TMP); \ $(call apply_patches, $(HD6x-MALI-DRIVERS_PATCH)); \ - $(MAKE) -C $(BUILD_TMP)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS); \ - $(MAKE) -C $(BUILD_TMP)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install + $(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS); \ + $(MAKE) -C $(BUILD_DIR)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install make depmod $(REMOVE)/$(HD6x-MALI-DRIVERS_TMP) $(TOUCH) diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index a13d872b..4b4749db 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -209,9 +209,9 @@ kernel.do_prepare: $(REMOVE)/$(KERNEL_MODULES) $(MKDIR)/$(KERNEL_OBJ) $(MKDIR)/$(KERNEL_MODULES) - $(INSTALL_DATA) $(KERNEL_CONFIG) $(BUILD_TMP)/$(KERNEL_OBJ)/.config + $(INSTALL_DATA) $(KERNEL_CONFIG) $(BUILD_DIR)/$(KERNEL_OBJ)/.config ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 hd60 hd61)) - $(INSTALL_DATA) $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_TMP)/$(KERNEL_OBJ) + $(INSTALL_DATA) $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_DIR)/$(KERNEL_OBJ) endif $(TOUCH) @@ -219,8 +219,8 @@ kernel.do_prepare.git: $(MAKE) kernel.do_checkout # $(REMOVE)/$(KERNEL_TMP) - tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x - $(CD) $(BUILD_TMP); \ + tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_DIR) -x + $(CD) $(BUILD_DIR); \ mv $(NI-LINUX-KERNEL) $(KERNEL_TMP) kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE) diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index b732df5c..9cc853b0 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -17,7 +17,7 @@ endif # ----------------------------------------------------------------------------- -NP_OBJ_DIR = $(BUILD_TMP)/$(NI-NEUTRINO-PLUGINS) +NP_OBJ_DIR = $(BUILD_DIR)/$(NI-NEUTRINO-PLUGINS) NP_DEPS = ffmpeg NP_DEPS += libcurl diff --git a/make/neutrino.mk b/make/neutrino.mk index 52aead37..a1bed99b 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- N_INST_DIR ?= $(TARGET_DIR) -N_OBJ_DIR = $(BUILD_TMP)/$(NI-NEUTRINO) +N_OBJ_DIR = $(BUILD_DIR)/$(NI-NEUTRINO) # ----------------------------------------------------------------------------- @@ -192,7 +192,7 @@ $(TARGET_DIR)/etc/init.d/start_neutrino: # ----------------------------------------------------------------------------- -LH_OBJ_DIR = $(BUILD_TMP)/$(NI-LIBSTB-HAL) +LH_OBJ_DIR = $(BUILD_DIR)/$(NI-LIBSTB-HAL) # ----------------------------------------------------------------------------- diff --git a/make/target-blobs.mk b/make/target-blobs.mk index 94a7994b..cf206427 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -287,10 +287,10 @@ vuuno4kse-libgles \ vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-LIBGLES_TMP) $(UNTAR)/$(BOXMODEL-LIBGLES_SOURCE) - $(INSTALL_EXEC) $(BUILD_TMP)/$(BOXMODEL-LIBGLES_TMP)/lib/* $(TARGET_LIB_DIR) + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_TMP)/lib/* $(TARGET_LIB_DIR) ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libEGL.so ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libGLESv2.so - $(INSTALL_COPY) $(BUILD_TMP)/$(BOXMODEL-LIBGLES_TMP)/include/* $(TARGET_INCLUDE_DIR) + $(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_TMP)/include/* $(TARGET_INCLUDE_DIR) $(REMOVE)/$(BOXMODEL-LIBGLES_TMP) $(TOUCH) @@ -321,10 +321,10 @@ endif hd60-libs \ hd61-libs: $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-LIBS_TMP) - unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_TMP)/$(BOXMODEL-LIBS_TMP) + unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL-LIBS_TMP) mkdir -p $(TARGET_USR_LIB_DIR)/hisilicon - $(INSTALL_EXEC) $(BUILD_TMP)/$(BOXMODEL-LIBS_TMP)/hisilicon/* $(TARGET_USR_LIB_DIR)/hisilicon - $(INSTALL_EXEC) $(BUILD_TMP)/$(BOXMODEL-LIBS_TMP)/ffmpeg/* $(TARGET_USR_LIB_DIR)/hisilicon + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_TMP)/hisilicon/* $(TARGET_USR_LIB_DIR)/hisilicon + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_TMP)/ffmpeg/* $(TARGET_USR_LIB_DIR)/hisilicon ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_USR_LIB_DIR)/hisilicon/ld-linux.so $(REMOVE)/$(BOXMODEL-LIBS_TMP) $(TOUCH) @@ -381,7 +381,7 @@ endif vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP) $(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_USR_BIN_DIR) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_USR_BIN_DIR) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_DIR)/etc/init.d/vuplus-platform-util ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k)) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_USR_BIN_DIR)/bp3flash.sh diff --git a/make/target-development.mk b/make/target-development.mk index 8dd1c67a..22e79d5f 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -48,7 +48,7 @@ VALGRIND12305_PATCH += valgrind12305-automake-1.11.2.patch valgrind12305: | $(TARGET_DIR) $(REMOVE)/valgrind - svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_TMP)/valgrind; \ + svn co -r 12305 svn://svn.valgrind.org/valgrind/trunk $(BUILD_DIR)/valgrind; \ $(CHDIR)/valgrind; \ svn up --force -r {2011-12-13} VEX; \ $(call apply_patches, $(VALGRIND12305_PATCH)); \ diff --git a/make/target-ffmpeg-coolstream.mk b/make/target-ffmpeg-coolstream.mk index fd080362..6b4c4192 100644 --- a/make/target-ffmpeg-coolstream.mk +++ b/make/target-ffmpeg-coolstream.mk @@ -174,7 +174,7 @@ ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR) $(REMOVE)/$(NI-FFMPEG) $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); \ git checkout $(NI-FFMPEG_BRANCH) - tar -C $(SOURCE_DIR) -cp $(NI-FFMPEG) --exclude-vcs | tar -C $(BUILD_TMP) -x + tar -C $(SOURCE_DIR) -cp $(NI-FFMPEG) --exclude-vcs | tar -C $(BUILD_DIR) -x $(CHDIR)/$(NI-FFMPEG); \ ./configure \ $(FFMPEG_CONFIGURE_GENERIC) \ diff --git a/make/target-libs.mk b/make/target-libs.mk index 227c7a3d..9761fd12 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -426,7 +426,7 @@ ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR) $(REMOVE)/$(NI-OPENTHREADS) - tar -C $(SOURCE_DIR) -cp $(NI-OPENTHREADS) --exclude-vcs | tar -C $(BUILD_TMP) -x + tar -C $(SOURCE_DIR) -cp $(NI-OPENTHREADS) --exclude-vcs | tar -C $(BUILD_DIR) -x $(CHDIR)/$(NI-OPENTHREADS)/; \ $(CMAKE) \ -DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \ @@ -961,7 +961,7 @@ RTMPDUMP_MAKE_OPTS = \ rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR) $(REMOVE)/$(NI-RTMPDUMP) - tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_TMP) -x + tar -C $(SOURCE_DIR) -cp $(NI-RTMPDUMP) --exclude-vcs | tar -C $(BUILD_DIR) -x $(CHDIR)/$(NI-RTMPDUMP); \ $(MAKE) $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)"; \ $(MAKE) $(RTMPDUMP_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index bffa4162..e2ef17b6 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -66,7 +66,7 @@ binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ for bin in $(BINUTILS_BIN); do \ - $(INSTALL_EXEC) $(BUILD_TMP)/$(BINUTILS_TMP)/binutils/$$bin $(TARGET_DIR)/bin/; \ + $(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_TMP)/binutils/$$bin $(TARGET_DIR)/bin/; \ done $(REMOVE)/$(BINUTILS_TMP) $(TOUCH) diff --git a/make/target-tools.mk b/make/target-tools.mk index 173b40e7..327ac9de 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -38,7 +38,7 @@ BUSYBOX_MAKE_OPTS = \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ CONFIG_PREFIX="$(TARGET_DIR)" -BUSYBOX_BUILD_CONFIG = $(BUILD_TMP)/$(BUSYBOX_TMP)/.config +BUSYBOX_BUILD_CONFIG = $(BUILD_DIR)/$(BUSYBOX_TMP)/.config define BUSYBOX_INSTALL_CONFIG $(INSTALL_DATA) $(CONFIGS)/busybox-minimal.config $(BUSYBOX_BUILD_CONFIG) @@ -272,13 +272,13 @@ mtd-utils: $(MTD-UTILS_DEPS) $(DL_DIR)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) ifeq ($(BOXSERIES), hd2) - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nanddump $(TARGET_DIR)/sbin - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nandtest $(TARGET_DIR)/sbin - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nandwrite $(TARGET_DIR)/sbin - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/mtd_debug $(TARGET_DIR)/sbin - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/mkfs.jffs2 $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/nanddump $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/nandtest $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/nandwrite $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/mtd_debug $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/mkfs.jffs2 $(TARGET_DIR)/sbin endif - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/flash_erase $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/flash_erase $(TARGET_DIR)/sbin $(REMOVE)/$(MTD-UTILS_TMP) $(TOUCH) @@ -1513,7 +1513,7 @@ STREAMRIPPER_DEPS = libvorbisidec libmad glib2 streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR) $(REMOVE)/$(NI-STREAMRIPPER) - tar -C $(SOURCE_DIR) -cp $(NI-STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_TMP) -x + tar -C $(SOURCE_DIR) -cp $(NI-STREAMRIPPER) --exclude-vcs | tar -C $(BUILD_DIR) -x $(CHDIR)/$(NI-STREAMRIPPER); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1646,13 +1646,13 @@ wget: $(WGET_DEPS) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR) ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR) $(REMOVE)/$(NI-OFGWRITE) - tar -C $(SOURCE_DIR) -cp $(NI-OFGWRITE) --exclude-vcs | tar -C $(BUILD_TMP) -x + tar -C $(SOURCE_DIR) -cp $(NI-OFGWRITE) --exclude-vcs | tar -C $(BUILD_DIR) -x $(CHDIR)/$(NI-OFGWRITE); \ $(MAKE_ENV) \ $(MAKE) - $(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin - $(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin - $(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite $(TARGET_DIR)/bin + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin + $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite $(TARGET_DIR)/bin $(REMOVE)/$(NI-OFGWRITE) $(TOUCH) @@ -1800,7 +1800,7 @@ $(DL_DIR)/$(SYSVINIT_SOURCE): define SYSVINIT_INSTALL for sbin in halt init shutdown killall5; do \ - $(INSTALL_EXEC) -D $(BUILD_TMP)/$(SYSVINIT_TMP)/src/$$sbin $(TARGET_DIR)/sbin/$$sbin || exit 1; \ + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(SYSVINIT_TMP)/src/$$sbin $(TARGET_DIR)/sbin/$$sbin || exit 1; \ done ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff