Browse Source

- rename $(BUILD_TMP) => $(BUILD_DIR)

master
vanhofen 5 years ago
parent
commit
de08c1f8f2
  1. 6
      make/bootstrap.mk
  2. 2
      make/clean.mk
  3. 12
      make/crosstool.mk
  4. 20
      make/environment-build.mk
  5. 2
      make/environment-image.mk
  6. 24
      make/environment-linux.mk
  7. 2
      make/environment-update.mk
  8. 11
      make/helpers.mk
  9. 6
      make/host-tools.mk
  10. 2
      make/image-updates.mk
  11. 10
      make/images.mk
  12. 6
      make/linux-drivers.mk
  13. 8
      make/linux-kernel.mk
  14. 2
      make/neutrino-plugins.mk
  15. 4
      make/neutrino.mk
  16. 12
      make/target-blobs.mk
  17. 2
      make/target-development.mk
  18. 2
      make/target-ffmpeg-coolstream.mk
  19. 4
      make/target-libs.mk
  20. 2
      make/target-tools-unused.mk
  21. 26
      make/target-tools.mk

6
make/bootstrap.mk

@ -7,7 +7,7 @@
BOOTSTRAP = $(CROSS_DIR) BOOTSTRAP = $(CROSS_DIR)
BOOTSTRAP += $(STATIC_DIR) BOOTSTRAP += $(STATIC_DIR)
BOOTSTRAP += $(DEPS_DIR) BOOTSTRAP += $(DEPS_DIR)
BOOTSTRAP += $(BUILD_TMP) BOOTSTRAP += $(BUILD_DIR)
BOOTSTRAP += $(STAGING_DIR) BOOTSTRAP += $(STAGING_DIR)
BOOTSTRAP += $(IMAGE_DIR) BOOTSTRAP += $(IMAGE_DIR)
BOOTSTRAP += $(UPDATE_DIR) BOOTSTRAP += $(UPDATE_DIR)
@ -25,7 +25,7 @@ endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
bootstrap: $(BOOTSTRAP) bootstrap: $(BOOTSTRAP)
@touch $(BUILD_TMP)/.$(BOXTYPE)-$(BOXMODEL) @touch $(BUILD_DIR)/.$(BOXTYPE)-$(BOXMODEL)
$(call draw_line); $(call draw_line);
@echo -e "$(TERM_YELLOW)Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))$(TERM_NORMAL)" @echo -e "$(TERM_YELLOW)Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))$(TERM_NORMAL)"
$(call draw_line); $(call draw_line);
@ -83,7 +83,7 @@ $(TARGET_DIR):
$(STATIC_DIR) \ $(STATIC_DIR) \
$(DEPS_DIR) \ $(DEPS_DIR) \
$(BUILD_TMP) \ $(BUILD_DIR) \
$(STAGING_DIR) \ $(STAGING_DIR) \
$(IMAGE_DIR) \ $(IMAGE_DIR) \
$(UPDATE_DIR): $(UPDATE_DIR):

2
make/clean.mk

@ -4,7 +4,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
build-clean: build-clean:
-rm -rf $(BUILD_TMP) -rm -rf $(BUILD_DIR)
cross-base-clean: cross-base-clean:
-rm -rf $(CROSS_BASE) -rm -rf $(CROSS_BASE)

12
make/crosstool.mk

@ -45,12 +45,12 @@ crosstools-renew:
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# wrapper for manually call # wrapper for manually call
kernel-tarball: $(BUILD_TMP)/linux-$(KERNEL_VER).tar kernel-tarball: $(BUILD_DIR)/linux-$(KERNEL_VER).tar
# create kernel-tarball # 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) $(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 # crosstool for arm-hd2 depends on gcc-linaro
$(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC-LINARO_SOURCE) $(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC-LINARO_SOURCE)
$(CROSS_DIR): | $(BUILD_TMP) $(CROSS_DIR): | $(BUILD_DIR)
make $(BUILD_TMP)/linux-$(KERNEL_VER).tar make $(BUILD_DIR)/linux-$(KERNEL_VER).tar
# #
$(REMOVE)/$(CROSSTOOL-NG_TMP) $(REMOVE)/$(CROSSTOOL-NG_TMP)
$(GET-GIT-SOURCE) $(CROSSTOOL-NG_SITE)/$(CROSSTOOL-NG_SOURCE) $(DL_DIR)/$(CROSSTOOL-NG_SOURCE) $(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_LOCAL_TARBALLS_DIR=$(DL_DIR); \
export NI_PREFIX_DIR=$(@); \ export NI_PREFIX_DIR=$(@); \
export NI_KERNEL_VERSION=$(KERNEL_VER); \ 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 NI_LIBC_UCLIBC_CONFIG_FILE=$(CONFIGS)/ct-ng-uClibc-$(UCLIBC_VER).config; \
export LD_LIBRARY_PATH=; \ export LD_LIBRARY_PATH=; \
test -f ./configure || ./bootstrap; \ test -f ./configure || ./bootstrap; \

20
make/environment-build.mk

@ -31,10 +31,10 @@ BASE_DIR := $(shell pwd)
MAINTAINER ?= unknown MAINTAINER ?= unknown
WHOAMI := $(shell id -un) WHOAMI := $(shell id -un)
DL_DIR = $(BASE_DIR)/download DL_DIR = $(BASE_DIR)/download
BUILD_TMP = $(BASE_DIR)/build_tmp BUILD_DIR = $(BASE_DIR)/build_tmp
ROOTFS = $(BUILD_TMP)/rootfs ROOTFS = $(BUILD_DIR)/rootfs
ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x)) ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x))
ROOTFS = $(BUILD_TMP)/rootfs/linuxrootfs1 ROOTFS = $(BUILD_DIR)/rootfs/linuxrootfs1
endif endif
DEPS_DIR = $(BASE_DIR)/deps DEPS_DIR = $(BASE_DIR)/deps
D = $(DEPS_DIR) D = $(DEPS_DIR)
@ -74,7 +74,7 @@ PKG_VER = $($(PKG_UPPER)_VER)
PKG_TMP = $($(PKG_UPPER)_TMP) PKG_TMP = $($(PKG_UPPER)_TMP)
PKG_SOURCE = $($(PKG_UPPER)_SOURCE) PKG_SOURCE = $($(PKG_UPPER)_SOURCE)
PKG_SITE = $($(PKG_UPPER)_SITE) 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)) 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) DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR)
# unpack archives into build directory # unpack archives into build directory
UNTAR = tar -C $(BUILD_TMP) -xf $(DL_DIR) UNTAR = tar -C $(BUILD_DIR) -xf $(DL_DIR)
UNZIP = unzip -d $(BUILD_TMP) -o $(DL_DIR) UNZIP = unzip -d $(BUILD_DIR) -o $(DL_DIR)
# clean up # clean up
REMOVE = rm -rf $(BUILD_TMP) REMOVE = rm -rf $(BUILD_DIR)
# apply patches # apply patches
PATCH = patch -p1 -i $(PATCHES) PATCH = patch -p1 -i $(PATCHES)
# build helper variables # build helper variables
CD = set -e; cd CD = set -e; cd
CHDIR = $(CD) $(BUILD_TMP) CHDIR = $(CD) $(BUILD_DIR)
MKDIR = mkdir -p $(BUILD_TMP) MKDIR = mkdir -p $(BUILD_DIR)
CPDIR = cp -a -t $(BUILD_TMP) $(DL_DIR) CPDIR = cp -a -t $(BUILD_DIR) $(DL_DIR)
#TOUCH = @touch $(DEPS_DIR)/$(@) #TOUCH = @touch $(DEPS_DIR)/$(@)
TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@) TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@)

2
make/environment-image.mk

@ -63,7 +63,7 @@ endif
IMAGE_SITE = $(NI-SERVER)/$(NI-SUBDIR) IMAGE_SITE = $(NI-SERVER)/$(NI-SUBDIR)
IMAGE_MD5FILE = $(IMAGE_TYPE_STRING)-$(IMAGE_SUFFIX).txt 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)) ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
IMAGE_SUBDIR = $(subst vu,vuplus/,$(BOXMODEL)) IMAGE_SUBDIR = $(subst vu,vuplus/,$(BOXMODEL))

24
make/environment-linux.mk

@ -34,7 +34,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7))
KERNEL_SITE = http://downloads.mutant-digital.net KERNEL_SITE = http://downloads.mutant-digital.net
KERNEL_BRANCH = $(EMPTY) 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 KERNEL_CONFIG = $(CONFIGS)/kernel-hd5x.config
BOOT_PARTITION = 1 BOOT_PARTITION = 1
@ -47,7 +47,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60))
KERNEL_SITE = http://source.mynonpublic.com/gfutures KERNEL_SITE = http://source.mynonpublic.com/gfutures
KERNEL_BRANCH = $(EMPTY) 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 KERNEL_CONFIG = $(CONFIGS)/kernel-hd6x.config
BOOT_PARTITION = 4 BOOT_PARTITION = 4
@ -60,7 +60,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd61))
KERNEL_SITE = http://source.mynonpublic.com/gfutures KERNEL_SITE = http://source.mynonpublic.com/gfutures
KERNEL_BRANCH = $(EMPTY) 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 KERNEL_CONFIG = $(CONFIGS)/kernel-hd6x.config
BOOT_PARTITION = 4 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) ifeq ($(BOXMODEL), nevis)
KERNEL_UIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image KERNEL_UIMAGE = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/Image
else else
KERNEL_UIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/uImage KERNEL_UIMAGE = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/uImage
endif endif
KERNEL_ZIMAGE = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage KERNEL_ZIMAGE = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage
KERNEL_ZIMAGE_DTB = $(BUILD_TMP)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage_dtb KERNEL_ZIMAGE_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(BOXARCH)/boot/zImage_dtb
KERNEL_VMLINUX = $(BUILD_TMP)/$(KERNEL_OBJ)/vmlinux KERNEL_VMLINUX = $(BUILD_DIR)/$(KERNEL_OBJ)/vmlinux
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
KERNEL_MAKEVARS = \ KERNEL_MAKEVARS = \
ARCH=$(BOXARCH) \ ARCH=$(BOXARCH) \
CROSS_COMPILE=$(TARGET_CROSS) \ CROSS_COMPILE=$(TARGET_CROSS) \
INSTALL_MOD_PATH=$(BUILD_TMP)/$(KERNEL_MODULES) \ INSTALL_MOD_PATH=$(BUILD_DIR)/$(KERNEL_MODULES) \
LOCALVERSION= \ LOCALVERSION= \
O=$(BUILD_TMP)/$(KERNEL_OBJ) O=$(BUILD_DIR)/$(KERNEL_OBJ)
# Compatibility variables # Compatibility variables
KERNEL_MAKEVARS += \ KERNEL_MAKEVARS += \
KVER=$(KERNEL_VER) \ KVER=$(KERNEL_VER) \
KSRC=$(BUILD_TMP)/$(KERNEL_TMP) KSRC=$(BUILD_DIR)/$(KERNEL_TMP)
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo)) ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo))
KERNEL_IMAGE = vmlinux KERNEL_IMAGE = vmlinux

2
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_INST_DIR = $(UPDATE_TEMP_DIR)/inst
UPDATE_CTRL_DIR = $(UPDATE_TEMP_DIR)/ctrl UPDATE_CTRL_DIR = $(UPDATE_TEMP_DIR)/ctrl

11
make/helpers.mk

@ -6,7 +6,7 @@
# execute local scripts # execute local scripts
define local-script define local-script
@if [ -x $(LOCAL_DIR)/scripts/$(1) ]; then \ @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 fi
endef endef
@ -65,6 +65,7 @@ define rewrite_libtool
$(REWRITE_LIBTOOL)/$${la}; \ $(REWRITE_LIBTOOL)/$${la}; \
echo -e "\n# Adapted to buildsystem\n$(REWRITE_LIBTOOL_TAG)" >> $${la}; \ echo -e "\n# Adapted to buildsystem\n$(REWRITE_LIBTOOL_TAG)" >> $${la}; \
fi; \ fi; \
done
endef endef
# rewrite libtool libraries automatically # rewrite libtool libraries automatically
@ -178,8 +179,8 @@ endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
archives-list: archives-list:
@rm -f $(BUILD_TMP)/$(@) @rm -f $(BUILD_DIR)/$(@)
@make -qp | grep --only-matching '^\$(DL_DIR).*:' | sed "s|:||g" > $(BUILD_TMP)/$(@) @make -qp | grep --only-matching '^\$(DL_DIR).*:' | sed "s|:||g" > $(BUILD_DIR)/$(@)
DOCLEANUP ?= no DOCLEANUP ?= no
GETMISSING ?= no GETMISSING ?= no
@ -209,7 +210,7 @@ archives-info: archives-list
@echo "[ ** ] Unused archives" @echo "[ ** ] Unused archives"
@find $(DL_DIR)/ -maxdepth 1 -type f | \ @find $(DL_DIR)/ -maxdepth 1 -type f | \
while read archive; do \ 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"; \ echo -e "[$(TERM_YELLOW) rm $(TERM_NORMAL)] $$archive"; \
if [ "$(DOCLEANUP)" = "yes" ]; then \ if [ "$(DOCLEANUP)" = "yes" ]; then \
rm $$archive; \ rm $$archive; \
@ -217,7 +218,7 @@ archives-info: archives-list
fi; \ fi; \
done; done;
@echo "[ ** ] Missing archives" @echo "[ ** ] Missing archives"
@cat $(BUILD_TMP)/archives-list | \ @cat $(BUILD_DIR)/archives-list | \
while read archive; do \ while read archive; do \
if [ -e $$archive ]; then \ if [ -e $$archive ]; then \
#echo -e "[$(TERM_GREEN) ok $(TERM_NORMAL)] $$archive"; \ #echo -e "[$(TERM_GREEN) ok $(TERM_NORMAL)] $$archive"; \

6
make/host-tools.mk

@ -138,7 +138,7 @@ $(HOST_DIR)/bin/mkimage: $(DL_DIR)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR)
$(MAKE) defconfig; \ $(MAKE) defconfig; \
$(MAKE) silentoldconfig; \ $(MAKE) silentoldconfig; \
$(MAKE) tools-only $(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) $(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_TZCODE_SOURCE); \
tar -xf $(DL_DIR)/$(HOST_TZDATA_SOURCE); \ tar -xf $(DL_DIR)/$(HOST_TZDATA_SOURCE); \
$(MAKE) zic $(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) $(REMOVE)/$(HOST_TZCODE_TMP)
$(TOUCH) $(TOUCH)
@ -296,7 +296,7 @@ host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR)
-DCMAKE_INSTALL_PREFIX="" \ -DCMAKE_INSTALL_PREFIX="" \
; \ ; \
$(MAKE) $(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) $(REMOVE)/$(HOST_NINJA_TMP)
$(TOUCH) $(TOUCH)

2
make/image-updates.mk

@ -197,7 +197,7 @@ u-clean-all: u-clean
rm -rf $(UPDATE_DIR) rm -rf $(UPDATE_DIR)
u-update-bin: u-update-bin:
$(CD) $(BUILD_TMP); \ $(CD) $(BUILD_DIR); \
tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst 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) 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 $(MAKE) u-clean

10
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) ifeq ($(BOXSERIES), hd1)
MKFSFLAGS += -p MKFSFLAGS += -p
endif 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:
# <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count> # <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
echo "/dev/pts d 755 0 0 - - - - -" > $(@) echo "/dev/pts d 755 0 0 - - - - -" > $(@)
echo "/dev/shm 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/mtd c 640 0 0 90 0 0 2 6" >> $(@)
echo "/dev/mtdblock b 640 0 0 31 0 0 1 6" >> $(@) echo "/dev/mtdblock b 640 0 0 31 0 0 1 6" >> $(@)
$(BUILD_TMP)/devtable-hd2.txt: $(BUILD_DIR)/devtable-hd2.txt:
# <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count> # <name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
echo "/dev/pts d 755 0 0 - - - - -" > $(@) echo "/dev/pts d 755 0 0 - - - - -" > $(@)
echo "/dev/shm 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) rm -rf $(IMAGE_BUILD_TMP)
mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash_auto.bin 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 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)/kernel1_auto.bin
cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel2_auto.bin cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel2_auto.bin

6
make/linux-drivers.mk

@ -31,7 +31,7 @@ $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE):
HD6x-MALI-DRIVERS_PATCH = hi3798mv200-support.patch HD6x-MALI-DRIVERS_PATCH = hi3798mv200-support.patch
HD6x-MALI-DRIVERS_MAKEVARS = \ 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" \ EXTRA_CFLAGS="-DCONFIG_MALI_DVFS=y -DCONFIG_GPU_AVS_ENABLE=y" \
CONFIG_MALI_SHARED_INTERRUPTS=y \ CONFIG_MALI_SHARED_INTERRUPTS=y \
CONFIG_MALI400=m \ CONFIG_MALI400=m \
@ -45,8 +45,8 @@ hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x-MALI-
$(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE) $(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE)
$(CHDIR)/$(HD6x-MALI-DRIVERS_TMP); \ $(CHDIR)/$(HD6x-MALI-DRIVERS_TMP); \
$(call apply_patches, $(HD6x-MALI-DRIVERS_PATCH)); \ $(call apply_patches, $(HD6x-MALI-DRIVERS_PATCH)); \
$(MAKE) -C $(BUILD_TMP)/$(KERNEL_OBJ) $(KERNEL_MAKEVARS) $(HD6x-MALI-DRIVERS_MAKEVARS); \ $(MAKE) -C $(BUILD_DIR)/$(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) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
make depmod make depmod
$(REMOVE)/$(HD6x-MALI-DRIVERS_TMP) $(REMOVE)/$(HD6x-MALI-DRIVERS_TMP)
$(TOUCH) $(TOUCH)

8
make/linux-kernel.mk

@ -209,9 +209,9 @@ kernel.do_prepare:
$(REMOVE)/$(KERNEL_MODULES) $(REMOVE)/$(KERNEL_MODULES)
$(MKDIR)/$(KERNEL_OBJ) $(MKDIR)/$(KERNEL_OBJ)
$(MKDIR)/$(KERNEL_MODULES) $(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)) 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 endif
$(TOUCH) $(TOUCH)
@ -219,8 +219,8 @@ kernel.do_prepare.git:
$(MAKE) kernel.do_checkout $(MAKE) kernel.do_checkout
# #
$(REMOVE)/$(KERNEL_TMP) $(REMOVE)/$(KERNEL_TMP)
tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_TMP) -x tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_DIR) -x
$(CD) $(BUILD_TMP); \ $(CD) $(BUILD_DIR); \
mv $(NI-LINUX-KERNEL) $(KERNEL_TMP) mv $(NI-LINUX-KERNEL) $(KERNEL_TMP)
kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE) kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE)

2
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 = ffmpeg
NP_DEPS += libcurl NP_DEPS += libcurl

4
make/neutrino.mk

@ -4,7 +4,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
N_INST_DIR ?= $(TARGET_DIR) 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)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

12
make/target-blobs.mk

@ -287,10 +287,10 @@ vuuno4kse-libgles \
vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(BOXMODEL-LIBGLES_TMP) $(REMOVE)/$(BOXMODEL-LIBGLES_TMP)
$(UNTAR)/$(BOXMODEL-LIBGLES_SOURCE) $(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)/libEGL.so
ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libGLESv2.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) $(REMOVE)/$(BOXMODEL-LIBGLES_TMP)
$(TOUCH) $(TOUCH)
@ -321,10 +321,10 @@ endif
hd60-libs \ hd60-libs \
hd61-libs: $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR) hd61-libs: $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(BOXMODEL-LIBS_TMP) $(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 mkdir -p $(TARGET_USR_LIB_DIR)/hisilicon
$(INSTALL_EXEC) $(BUILD_TMP)/$(BOXMODEL-LIBS_TMP)/hisilicon/* $(TARGET_USR_LIB_DIR)/hisilicon $(INSTALL_EXEC) $(BUILD_DIR)/$(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)/ffmpeg/* $(TARGET_USR_LIB_DIR)/hisilicon
ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_USR_LIB_DIR)/hisilicon/ld-linux.so ln -sf /lib/ld-linux-armhf.so.3 $(TARGET_USR_LIB_DIR)/hisilicon/ld-linux.so
$(REMOVE)/$(BOXMODEL-LIBS_TMP) $(REMOVE)/$(BOXMODEL-LIBS_TMP)
$(TOUCH) $(TOUCH)
@ -381,7 +381,7 @@ endif
vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP) $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP)
$(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) $(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 $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vuplus-platform-util.init $(TARGET_DIR)/etc/init.d/vuplus-platform-util
ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k)) ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k))
$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_USR_BIN_DIR)/bp3flash.sh $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(TARGET_USR_BIN_DIR)/bp3flash.sh

2
make/target-development.mk

@ -48,7 +48,7 @@ VALGRIND12305_PATCH += valgrind12305-automake-1.11.2.patch
valgrind12305: | $(TARGET_DIR) valgrind12305: | $(TARGET_DIR)
$(REMOVE)/valgrind $(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; \ $(CHDIR)/valgrind; \
svn up --force -r {2011-12-13} VEX; \ svn up --force -r {2011-12-13} VEX; \
$(call apply_patches, $(VALGRIND12305_PATCH)); \ $(call apply_patches, $(VALGRIND12305_PATCH)); \

2
make/target-ffmpeg-coolstream.mk

@ -174,7 +174,7 @@ ffmpeg: $(FFMPEG_DEPS) | $(TARGET_DIR)
$(REMOVE)/$(NI-FFMPEG) $(REMOVE)/$(NI-FFMPEG)
$(CD) $(SOURCE_DIR)/$(NI-FFMPEG); \ $(CD) $(SOURCE_DIR)/$(NI-FFMPEG); \
git checkout $(NI-FFMPEG_BRANCH) 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); \ $(CHDIR)/$(NI-FFMPEG); \
./configure \ ./configure \
$(FFMPEG_CONFIGURE_GENERIC) \ $(FFMPEG_CONFIGURE_GENERIC) \

4
make/target-libs.mk

@ -426,7 +426,7 @@ ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR)
openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR) openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR)
$(REMOVE)/$(NI-OPENTHREADS) $(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)/; \ $(CHDIR)/$(NI-OPENTHREADS)/; \
$(CMAKE) \ $(CMAKE) \
-DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \ -DCMAKE_SUPPRESS_DEVELOPER_WARNINGS="1" \
@ -961,7 +961,7 @@ RTMPDUMP_MAKE_OPTS = \
rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR) rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR)
$(REMOVE)/$(NI-RTMPDUMP) $(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); \ $(CHDIR)/$(NI-RTMPDUMP); \
$(MAKE) $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)"; \ $(MAKE) $(RTMPDUMP_MAKE_OPTS) CROSS_COMPILE=$(TARGET_CROSS) XCFLAGS="$(TARGET_CFLAGS)" XLDFLAGS="$(TARGET_LDFLAGS)"; \
$(MAKE) $(RTMPDUMP_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) $(MAKE) $(RTMPDUMP_MAKE_OPTS) install DESTDIR=$(TARGET_DIR)

2
make/target-tools-unused.mk

@ -66,7 +66,7 @@ binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
; \ ; \
$(MAKE); \ $(MAKE); \
for bin in $(BINUTILS_BIN); do \ 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 done
$(REMOVE)/$(BINUTILS_TMP) $(REMOVE)/$(BINUTILS_TMP)
$(TOUCH) $(TOUCH)

26
make/target-tools.mk

@ -38,7 +38,7 @@ BUSYBOX_MAKE_OPTS = \
EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
CONFIG_PREFIX="$(TARGET_DIR)" CONFIG_PREFIX="$(TARGET_DIR)"
BUSYBOX_BUILD_CONFIG = $(BUILD_TMP)/$(BUSYBOX_TMP)/.config BUSYBOX_BUILD_CONFIG = $(BUILD_DIR)/$(BUSYBOX_TMP)/.config
define BUSYBOX_INSTALL_CONFIG define BUSYBOX_INSTALL_CONFIG
$(INSTALL_DATA) $(CONFIGS)/busybox-minimal.config $(BUSYBOX_BUILD_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) $(MAKE)
ifeq ($(BOXSERIES), hd2) ifeq ($(BOXSERIES), hd2)
$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nanddump $(TARGET_DIR)/sbin $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/nanddump $(TARGET_DIR)/sbin
$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nandtest $(TARGET_DIR)/sbin $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/nandtest $(TARGET_DIR)/sbin
$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nandwrite $(TARGET_DIR)/sbin $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/nandwrite $(TARGET_DIR)/sbin
$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/mtd_debug $(TARGET_DIR)/sbin $(INSTALL_EXEC) -D $(BUILD_DIR)/$(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)/mkfs.jffs2 $(TARGET_DIR)/sbin
endif 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) $(REMOVE)/$(MTD-UTILS_TMP)
$(TOUCH) $(TOUCH)
@ -1513,7 +1513,7 @@ STREAMRIPPER_DEPS = libvorbisidec libmad glib2
streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR) streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR)
$(REMOVE)/$(NI-STREAMRIPPER) $(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); \ $(CHDIR)/$(NI-STREAMRIPPER); \
autoreconf -fi; \ autoreconf -fi; \
$(CONFIGURE) \ $(CONFIGURE) \
@ -1646,13 +1646,13 @@ wget: $(WGET_DEPS) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR)
ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR) ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR)
$(REMOVE)/$(NI-OFGWRITE) $(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); \ $(CHDIR)/$(NI-OFGWRITE); \
$(MAKE_ENV) \ $(MAKE_ENV) \
$(MAKE) $(MAKE)
$(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin
$(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin
$(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite $(TARGET_DIR)/bin $(INSTALL_EXEC) $(BUILD_DIR)/$(NI-OFGWRITE)/ofgwrite $(TARGET_DIR)/bin
$(REMOVE)/$(NI-OFGWRITE) $(REMOVE)/$(NI-OFGWRITE)
$(TOUCH) $(TOUCH)
@ -1800,7 +1800,7 @@ $(DL_DIR)/$(SYSVINIT_SOURCE):
define SYSVINIT_INSTALL define SYSVINIT_INSTALL
for sbin in halt init shutdown killall5; do \ 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 done
ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot
ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff

Loading…
Cancel
Save