From 8deee895bfe84a4cd8017dbf5377b67efc4864fb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 31 Oct 2020 23:33:02 +0100 Subject: [PATCH] - rename $(*_TMP) => $(*_DIR) --- make/crosstool.mk | 14 +- make/environment-build.mk | 4 +- make/environment-image.mk | 2 +- make/environment-linux.mk | 28 +-- make/host-tools.mk | 106 +++++----- make/images.mk | 144 ++++++------- make/linux-drivers.mk | 10 +- make/linux-kernel.mk | 10 +- make/neutrino-plugins.mk | 18 +- make/target-blobs.mk | 72 +++---- make/target-development.mk | 24 +-- make/target-ffmpeg.mk | 10 +- make/target-libs-static.mk | 8 +- make/target-libs-unused.mk | 56 ++--- make/target-libs.mk | 326 ++++++++++++++--------------- make/target-lua.mk | 40 ++-- make/target-tools-unused.mk | 50 ++--- make/target-tools.mk | 402 ++++++++++++++++++------------------ 18 files changed, 662 insertions(+), 662 deletions(-) diff --git a/make/crosstool.mk b/make/crosstool.mk index 892b7db8..29d47222 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -50,12 +50,12 @@ kernel-tarball: $(BUILD_DIR)/linux-$(KERNEL_VER).tar # create kernel-tarball $(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_DIR)/$(KERNEL_TMP) . + tar cf $(@) --exclude-vcs -C $(BUILD_DIR)/$(KERNEL_DIR) . # ----------------------------------------------------------------------------- CROSSTOOL-NG_VER = git -CROSSTOOL-NG_TMP = crosstool-ng.$(CROSSTOOL-NG_VER) +CROSSTOOL-NG_DIR = crosstool-ng.$(CROSSTOOL-NG_VER) CROSSTOOL-NG_SOURCE = crosstool-ng.$(CROSSTOOL-NG_VER) CROSSTOOL-NG_SITE = https://github.com/neutrino-images @@ -84,19 +84,19 @@ $(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC-LINARO_SOURCE) $(CROSS_DIR): | $(BUILD_DIR) make $(BUILD_DIR)/linux-$(KERNEL_VER).tar # - $(REMOVE)/$(CROSSTOOL-NG_TMP) + $(REMOVE)/$(CROSSTOOL-NG_DIR) $(GET-GIT-SOURCE) $(CROSSTOOL-NG_SITE)/$(CROSSTOOL-NG_SOURCE) $(DL_DIR)/$(CROSSTOOL-NG_SOURCE) $(CPDIR)/$(CROSSTOOL-NG_SOURCE) ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) - $(CHDIR)/$(CROSSTOOL-NG_TMP); \ + $(CHDIR)/$(CROSSTOOL-NG_DIR); \ git checkout 1dbb06f2; \ $(call apply_patches, $(CROSSTOOL-NG_PATCH)) ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2)) - $(CHDIR)/$(CROSSTOOL-NG_TMP); \ + $(CHDIR)/$(CROSSTOOL-NG_DIR); \ $(INSTALL_COPY) $(PATCHES)/crosstool-ng/gcc/* patches/gcc/linaro-6.3-2017.02 endif endif - $(CHDIR)/$(CROSSTOOL-NG_TMP); \ + $(CHDIR)/$(CROSSTOOL-NG_DIR); \ unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE; \ $(INSTALL_DATA) $(CROSSTOOL-NG_CONFIG) .config; \ sed -i "s|^CT_PARALLEL_JOBS=.*|CT_PARALLEL_JOBS=$(PARALLEL_JOBS)|" .config; \ @@ -117,7 +117,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd1 hd2)) endif test -e $(CROSS_DIR)/$(TARGET)/lib || ln -sf sys-root/lib $(CROSS_DIR)/$(TARGET)/ rm -f $(CROSS_DIR)/$(TARGET)/sys-root/lib/libstdc++.so.6.0.*-gdb.py - $(REMOVE)/$(CROSSTOOL-NG_TMP) + $(REMOVE)/$(CROSSTOOL-NG_DIR) # ----------------------------------------------------------------------------- diff --git a/make/environment-build.mk b/make/environment-build.mk index e61ba83c..2a3d81e9 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -71,10 +71,10 @@ PKG_NAME = $(basename $(@F)) PKG_UPPER = $(call UPPERCASE,$(PKG_NAME)) PKG_LOWER = $(call LOWERCASE,$(PKG_NAME)) PKG_VER = $($(PKG_UPPER)_VER) -PKG_TMP = $($(PKG_UPPER)_TMP) +PKG_DIR = $($(PKG_UPPER)_DIR) PKG_SOURCE = $($(PKG_UPPER)_SOURCE) PKG_SITE = $($(PKG_UPPER)_SITE) -PKG_BUILD_TMP = $(BUILD_DIR)/$(PKG_TMP) +PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_DIR) PKG_PATCHES_DIR = $(PATCHES)/$(subst host-,,$(PKG_NAME)) # ----------------------------------------------------------------------------- diff --git a/make/environment-image.mk b/make/environment-image.mk index 7cb26e7f..081c456c 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_DIR)/image-build +IMAGE_BUILD_DIR = $(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 5cb1cf95..0d03df9f 100644 --- a/make/environment-linux.mk +++ b/make/environment-linux.mk @@ -5,7 +5,7 @@ ifeq ($(BOXMODEL), nevis) KERNEL_VER = 2.6.34.13 - KERNEL_TMP = linux-$(KERNEL_VER) + KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = git KERNEL_SITE = $(EMPTY) @@ -14,7 +14,7 @@ ifeq ($(BOXMODEL), nevis) else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos kronos_v2)) KERNEL_VER = 3.10.93 - KERNEL_TMP = linux-$(KERNEL_VER) + KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = git KERNEL_SITE = $(EMPTY) @@ -29,7 +29,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), apollo shiner kronos kronos_v2)) else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) KERNEL_VER = 4.10.12 - KERNEL_TMP = linux-$(KERNEL_VER) + KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = linux-$(KERNEL_VER)-arm.tar.gz KERNEL_SITE = http://downloads.mutant-digital.net @@ -42,7 +42,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7)) else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60)) KERNEL_VER = 4.4.35 KERNEL_DATE = 20200219 - KERNEL_TMP = linux-$(KERNEL_VER) + KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz KERNEL_SITE = http://source.mynonpublic.com/gfutures @@ -55,7 +55,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd60)) else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd61)) KERNEL_VER = 4.4.35 KERNEL_DATE = 20181228 - KERNEL_TMP = linux-$(KERNEL_VER) + KERNEL_DIR = linux-$(KERNEL_VER) KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz KERNEL_SITE = http://source.mynonpublic.com/gfutures @@ -67,7 +67,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd61)) else ifeq ($(BOXMODEL), vusolo4k) KERNEL_VER = 3.14.28-1.8 - KERNEL_TMP = linux + KERNEL_DIR = linux KERNEL_SOURCE = stblinux-3.14-1.8.tar.bz2 KERNEL_SITE = http://archive.vuplus.com/download/kernel @@ -83,7 +83,7 @@ else ifeq ($(BOXMODEL), vusolo4k) else ifeq ($(BOXMODEL), vuduo4k) KERNEL_VER = 4.1.45-1.17 - KERNEL_TMP = linux + KERNEL_DIR = linux KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2 KERNEL_SITE = http://archive.vuplus.com/download/kernel @@ -99,7 +99,7 @@ else ifeq ($(BOXMODEL), vuduo4k) else ifeq ($(BOXMODEL), vuduo4kse) KERNEL_VER = 4.1.45-1.17 - KERNEL_TMP = linux + KERNEL_DIR = linux KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2 KERNEL_SITE = http://archive.vuplus.com/download/kernel @@ -115,7 +115,7 @@ else ifeq ($(BOXMODEL), vuduo4kse) else ifeq ($(BOXMODEL), vuultimo4k) KERNEL_VER = 3.14.28-1.12 - KERNEL_TMP = linux + KERNEL_DIR = linux KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2 KERNEL_SITE = http://archive.vuplus.com/download/kernel @@ -131,7 +131,7 @@ else ifeq ($(BOXMODEL), vuultimo4k) else ifeq ($(BOXMODEL), vuzero4k) KERNEL_VER = 4.1.20-1.9 - KERNEL_TMP = linux + KERNEL_DIR = linux KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2 KERNEL_SITE = http://archive.vuplus.com/download/kernel @@ -147,7 +147,7 @@ else ifeq ($(BOXMODEL), vuzero4k) else ifeq ($(BOXMODEL), vuuno4k) KERNEL_VER = 3.14.28-1.12 - KERNEL_TMP = linux + KERNEL_DIR = linux KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2 KERNEL_SITE = http://archive.vuplus.com/download/kernel @@ -163,7 +163,7 @@ else ifeq ($(BOXMODEL), vuuno4k) else ifeq ($(BOXMODEL), vuuno4kse) KERNEL_VER = 4.1.20-1.9 - KERNEL_TMP = linux + KERNEL_DIR = linux KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2 KERNEL_SITE = http://archive.vuplus.com/download/kernel @@ -179,7 +179,7 @@ else ifeq ($(BOXMODEL), vuuno4kse) else ifeq ($(BOXMODEL), vuduo) KERNEL_VER = 3.9.6 - KERNEL_TMP = linux + KERNEL_DIR = linux KERNEL_SOURCE = stblinux-$(KERNEL_VER).tar.bz2 KERNEL_SITE = http://archive.vuplus.com/download/kernel @@ -221,7 +221,7 @@ KERNEL_MAKEVARS = \ # Compatibility variables KERNEL_MAKEVARS += \ KVER=$(KERNEL_VER) \ - KSRC=$(BUILD_DIR)/$(KERNEL_TMP) + KSRC=$(BUILD_DIR)/$(KERNEL_DIR) ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo)) KERNEL_IMAGE = vmlinux diff --git a/make/host-tools.mk b/make/host-tools.mk index 061540d0..412534b5 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -35,7 +35,7 @@ pkg-config-preqs: # ----------------------------------------------------------------------------- HOST_PKG-CONFIG_VER = 0.29.2 -HOST_PKG-CONFIG_TMP = pkg-config-$(HOST_PKG-CONFIG_VER) +HOST_PKG-CONFIG_DIR = pkg-config-$(HOST_PKG-CONFIG_VER) HOST_PKG-CONFIG_SOURCE = pkg-config-$(HOST_PKG-CONFIG_VER).tar.gz HOST_PKG-CONFIG_SITE = https://pkg-config.freedesktop.org/releases @@ -46,20 +46,20 @@ HOST_PKG-CONFIG = $(HOST_DIR)/bin/pkg-config host-pkg-config: $(HOST_PKG-CONFIG) $(HOST_PKG-CONFIG): $(DL_DIR)/$(HOST_PKG-CONFIG_SOURCE) | $(HOST_DIR) pkg-config-preqs - $(REMOVE)/$(HOST_PKG-CONFIG_TMP) + $(REMOVE)/$(HOST_PKG-CONFIG_DIR) $(UNTAR)/$(HOST_PKG-CONFIG_SOURCE) - $(CHDIR)/$(HOST_PKG-CONFIG_TMP); \ + $(CHDIR)/$(HOST_PKG-CONFIG_DIR); \ ./configure \ --with-pc_path=$(PKG_CONFIG_PATH) \ ; \ $(MAKE); \ $(INSTALL_EXEC) -D pkg-config $(HOST_PKG-CONFIG) - $(REMOVE)/$(HOST_PKG-CONFIG_TMP) + $(REMOVE)/$(HOST_PKG-CONFIG_DIR) # ----------------------------------------------------------------------------- HOST_PKGCONF_VER = 1.6.3 -HOST_PKGCONF_TMP = pkgconf-$(HOST_PKGCONF_VER) +HOST_PKGCONF_DIR = pkgconf-$(HOST_PKGCONF_VER) HOST_PKGCONF_SOURCE = pkgconf-$(HOST_PKGCONF_VER).tar.gz HOST_PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf @@ -70,9 +70,9 @@ HOST_PKGCONF_PATCH = 0001-Only-prefix-with-the-sysroot-a-subset-of-variables.pa HOST_PKGCONF_PATCH += 0002-Revert-main-assume-modversion-insted-of-version-if-o.patch host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs - $(REMOVE)/$(HOST_PKGCONF_TMP) + $(REMOVE)/$(HOST_PKGCONF_DIR) $(UNTAR)/$(HOST_PKGCONF_SOURCE) - $(CHDIR)/$(HOST_PKGCONF_TMP); \ + $(CHDIR)/$(HOST_PKGCONF_DIR); \ $(call apply_patches, $(addprefix $(@F)/,$(HOST_PKGCONF_PATCH))); \ ./configure \ --prefix=$(HOST_DIR) \ @@ -83,7 +83,7 @@ host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs $(MAKE); \ $(MAKE) install $(INSTALL_EXEC) $(PATCHES)/$(@F)/pkgconf-pkg-config $(HOST_PKG-CONFIG) - $(REMOVE)/$(HOST_PKGCONF_TMP) + $(REMOVE)/$(HOST_PKGCONF_DIR) # ----------------------------------------------------------------------------- @@ -93,7 +93,7 @@ $(PKG_CONFIG): $(HOST_PKG-CONFIG) # ----------------------------------------------------------------------------- HOST_MTD-UTILS_VER = $(MTD-UTILS_VER) -HOST_MTD-UTILS_TMP = mtd-utils-$(HOST_MTD-UTILS_VER) +HOST_MTD-UTILS_DIR = mtd-utils-$(HOST_MTD-UTILS_VER) HOST_MTD-UTILS_SOURCE = mtd-utils-$(HOST_MTD-UTILS_VER).tar.bz2 HOST_MTD-UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils @@ -101,9 +101,9 @@ HOST_MTD-UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils # $(DOWNLOAD) $(HOST_MTD-UTILS_SITE)/$(HOST_MTD-UTILS_SOURCE) host-mtd-utils: $(DL_DIR)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_MTD-UTILS_TMP) + $(REMOVE)/$(HOST_MTD-UTILS_DIR) $(UNTAR)/$(HOST_MTD-UTILS_SOURCE) - $(CHDIR)/$(HOST_MTD-UTILS_TMP); \ + $(CHDIR)/$(HOST_MTD-UTILS_DIR); \ ./configure \ ZLIB_CFLAGS=" " \ ZLIB_LIBS="-lz" \ @@ -117,13 +117,13 @@ host-mtd-utils: $(DL_DIR)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_MTD-UTILS_TMP) + $(REMOVE)/$(HOST_MTD-UTILS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HOST_U-BOOT_VER = 2018.09 -HOST_U-BOOT_TMP = u-boot-$(HOST_U-BOOT_VER) +HOST_U-BOOT_DIR = u-boot-$(HOST_U-BOOT_VER) HOST_U-BOOT_SOURCE = u-boot-$(HOST_U-BOOT_VER).tar.bz2 HOST_U-BOOT_SITE = ftp://ftp.denx.de/pub/u-boot @@ -132,19 +132,19 @@ $(DL_DIR)/$(HOST_U-BOOT_SOURCE): host-mkimage: $(HOST_DIR)/bin/mkimage $(HOST_DIR)/bin/mkimage: $(DL_DIR)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_U-BOOT_TMP) + $(REMOVE)/$(HOST_U-BOOT_DIR) $(UNTAR)/$(HOST_U-BOOT_SOURCE) - $(CHDIR)/$(HOST_U-BOOT_TMP); \ + $(CHDIR)/$(HOST_U-BOOT_DIR); \ $(MAKE) defconfig; \ $(MAKE) silentoldconfig; \ $(MAKE) tools-only - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_U-BOOT_TMP)/tools/mkimage $(HOST_DIR)/bin/ - $(REMOVE)/$(HOST_U-BOOT_TMP) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_U-BOOT_DIR)/tools/mkimage $(HOST_DIR)/bin/ + $(REMOVE)/$(HOST_U-BOOT_DIR) # ----------------------------------------------------------------------------- HOST_TZCODE_VER = 2019b -HOST_TZCODE_TMP = tzcode$(HOST_TZCODE_VER) +HOST_TZCODE_DIR = tzcode$(HOST_TZCODE_VER) HOST_TZCODE_SOURCE = tzcode$(HOST_TZCODE_VER).tar.gz HOST_TZCODE_SITE = ftp://ftp.iana.org/tz/releases @@ -152,7 +152,7 @@ $(DL_DIR)/$(HOST_TZCODE_SOURCE): $(DOWNLOAD) $(HOST_TZCODE_SITE)/$(HOST_TZCODE_SOURCE) HOST_TZDATA_VER = $(TZDATA_VER) -HOST_TZDATA_TMP = tzdata$(HOST_TZDATA_VER) +HOST_TZDATA_DIR = tzdata$(HOST_TZDATA_VER) HOST_TZDATA_SOURCE = tzdata$(HOST_TZDATA_VER).tar.gz HOST_TZDATA_SITE = ftp://ftp.iana.org/tz/releases @@ -162,20 +162,20 @@ HOST_TZDATA_SITE = ftp://ftp.iana.org/tz/releases HOST_ZIC = $(HOST_DIR)/sbin/zic host-zic: $(DL_DIR)/$(HOST_TZDATA_SOURCE) $(DL_DIR)/$(HOST_TZCODE_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_TZCODE_TMP) - $(MKDIR)/$(HOST_TZCODE_TMP) - $(CHDIR)/$(HOST_TZCODE_TMP); \ + $(REMOVE)/$(HOST_TZCODE_DIR) + $(MKDIR)/$(HOST_TZCODE_DIR) + $(CHDIR)/$(HOST_TZCODE_DIR); \ tar -xf $(DL_DIR)/$(HOST_TZCODE_SOURCE); \ tar -xf $(DL_DIR)/$(HOST_TZDATA_SOURCE); \ $(MAKE) zic - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_TZCODE_TMP)/zic $(HOST_ZIC) - $(REMOVE)/$(HOST_TZCODE_TMP) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_TZCODE_DIR)/zic $(HOST_ZIC) + $(REMOVE)/$(HOST_TZCODE_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HOST_PARTED_VER = $(PARTED_VER) -HOST_PARTED_TMP = parted-$(HOST_PARTED_VER) +HOST_PARTED_DIR = parted-$(HOST_PARTED_VER) HOST_PARTED_SOURCE = parted-$(HOST_PARTED_VER).tar.xz HOST_PARTED_SITE = https://ftp.gnu.org/gnu/parted @@ -186,9 +186,9 @@ HOST_PARTED_PATCH = parted-device-mapper.patch HOST_PARTED_PATCH += parted-sysmacros.patch host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_PARTED_TMP) + $(REMOVE)/$(HOST_PARTED_DIR) $(UNTAR)/$(HOST_PARTED_SOURCE) - $(CHDIR)/$(HOST_PARTED_TMP); \ + $(CHDIR)/$(HOST_PARTED_DIR); \ $(call apply_patches, $(HOST_PARTED_PATCH)); \ ./configure \ --prefix= \ @@ -200,13 +200,13 @@ host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_PARTED_TMP) + $(REMOVE)/$(HOST_PARTED_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HOST_DOSFSTOOLS_VER = $(DOSFSTOOLS_VER) -HOST_DOSFSTOOLS_TMP = dosfstools-$(HOST_DOSFSTOOLS_VER) +HOST_DOSFSTOOLS_DIR = dosfstools-$(HOST_DOSFSTOOLS_VER) HOST_DOSFSTOOLS_SOURCE = dosfstools-$(HOST_DOSFSTOOLS_VER).tar.xz HOST_DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(HOST_DOSFSTOOLS_VER) @@ -214,9 +214,9 @@ HOST_DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/downl # $(DOWNLOAD) $(HOST_DOSFSTOOLS_SITE)/$(HOST_DOSFSTOOLS_SOURCE) host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_DOSFSTOOLS_TMP) + $(REMOVE)/$(HOST_DOSFSTOOLS_DIR) $(UNTAR)/$(HOST_DOSFSTOOLS_SOURCE) - $(CHDIR)/$(HOST_DOSFSTOOLS_TMP); \ + $(CHDIR)/$(HOST_DOSFSTOOLS_DIR); \ ./configure \ --prefix= \ --without-udev \ @@ -226,13 +226,13 @@ host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR) ln -sf mkfs.fat $(HOST_DIR)/sbin/mkfs.vfat ln -sf mkfs.fat $(HOST_DIR)/sbin/mkfs.msdos ln -sf mkfs.fat $(HOST_DIR)/sbin/mkdosfs - $(REMOVE)/$(HOST_DOSFSTOOLS_TMP) + $(REMOVE)/$(HOST_DOSFSTOOLS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HOST_MTOOLS_VER = 4.0.19 -HOST_MTOOLS_TMP = mtools-$(HOST_MTOOLS_VER) +HOST_MTOOLS_DIR = mtools-$(HOST_MTOOLS_VER) HOST_MTOOLS_SOURCE = mtools-$(HOST_MTOOLS_VER).tar.gz HOST_MTOOLS_SITE = ftp://ftp.gnu.org/gnu/mtools @@ -240,21 +240,21 @@ $(DL_DIR)/$(HOST_MTOOLS_SOURCE): $(DOWNLOAD) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE) host-mtools: $(DL_DIR)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_MTOOLS_TMP) + $(REMOVE)/$(HOST_MTOOLS_DIR) $(UNTAR)/$(HOST_MTOOLS_SOURCE) - $(CHDIR)/$(HOST_MTOOLS_TMP); \ + $(CHDIR)/$(HOST_MTOOLS_DIR); \ ./configure \ --prefix= \ ; \ $(MAKE1); \ $(MAKE1) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_MTOOLS_TMP) + $(REMOVE)/$(HOST_MTOOLS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HOST_E2FSPROGS_VER = $(E2FSPROGS_VER) -HOST_E2FSPROGS_TMP = e2fsprogs-$(HOST_E2FSPROGS_VER) +HOST_E2FSPROGS_DIR = e2fsprogs-$(HOST_E2FSPROGS_VER) HOST_E2FSPROGS_SOURCE = e2fsprogs-$(HOST_E2FSPROGS_VER).tar.gz HOST_E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(HOST_E2FSPROGS_VER) @@ -262,21 +262,21 @@ HOST_E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fspro # $(DOWNLOAD) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE) host-e2fsprocs: $(DL_DIR)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_E2FSPROGS_TMP) + $(REMOVE)/$(HOST_E2FSPROGS_DIR) $(UNTAR)/$(HOST_E2FSPROGS_SOURCE) - $(CHDIR)/$(HOST_E2FSPROGS_TMP); \ + $(CHDIR)/$(HOST_E2FSPROGS_DIR); \ ./configure \ --prefix= \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOST_DIR) - $(REMOVE)/$(HOST_E2FSPROGS_TMP) + $(REMOVE)/$(HOST_E2FSPROGS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HOST_NINJA_VER = 1.10.0 -HOST_NINJA_TMP = ninja-$(HOST_NINJA_VER) +HOST_NINJA_DIR = ninja-$(HOST_NINJA_VER) HOST_NINJA_SOURCE = ninja-$(HOST_NINJA_VER).tar.gz HOST_NINJA_SITE = $(call github,ninja-build,ninja,v$(HOST_NINJA_VER)) @@ -288,22 +288,22 @@ $(DL_DIR)/$(HOST_NINJA_SOURCE): $(DOWNLOAD) $(HOST_NINJA_SITE)/$(HOST_NINJA_SOURCE) host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_NINJA_TMP) + $(REMOVE)/$(HOST_NINJA_DIR) $(UNTAR)/$(HOST_NINJA_SOURCE) - $(CHDIR)/$(HOST_NINJA_TMP); \ + $(CHDIR)/$(HOST_NINJA_DIR); \ $(call apply_patches, $(HOST_NINJA_PATCH)); \ cmake . \ -DCMAKE_INSTALL_PREFIX="" \ ; \ $(MAKE) - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_NINJA_TMP)/ninja $(HOST_DIR)/bin/ninja - $(REMOVE)/$(HOST_NINJA_TMP) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(HOST_NINJA_DIR)/ninja $(HOST_DIR)/bin/ninja + $(REMOVE)/$(HOST_NINJA_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HOST_LUA_VER = $(LUA_VER) -HOST_LUA_TMP = lua-$(HOST_LUA_VER) +HOST_LUA_DIR = lua-$(HOST_LUA_VER) HOST_LUA_SOURCE = lua-$(HOST_LUA_VER).tar.gz HOST_LUA_SITE = http://www.lua.org/ftp @@ -316,19 +316,19 @@ HOST_LUA_PATCH += lua-01-remove-readline.patch HOST_LUA = $(HOST_DIR)/bin/lua host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_LUA_TMP) + $(REMOVE)/$(HOST_LUA_DIR) $(UNTAR)/$(HOST_LUA_SOURCE) - $(CHDIR)/$(HOST_LUA_TMP); \ + $(CHDIR)/$(HOST_LUA_DIR); \ $(call apply_patches, $(HOST_LUA_PATCH)); \ $(MAKE) linux; \ $(MAKE) install INSTALL_TOP=$(HOST_DIR) - $(REMOVE)/$(HOST_LUA_TMP) + $(REMOVE)/$(HOST_LUA_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HOST_LUAROCKS_VER = 3.1.3 -HOST_LUAROCKS_TMP = luarocks-$(HOST_LUAROCKS_VER) +HOST_LUAROCKS_DIR = luarocks-$(HOST_LUAROCKS_VER) HOST_LUAROCKS_SOURCE = luarocks-$(HOST_LUAROCKS_VER).tar.gz HOST_LUAROCKS_SITE = https://luarocks.github.io/luarocks/releases @@ -353,9 +353,9 @@ HOST_LUAROCKS = $(HOST_DIR)/bin/luarocks host-luarocks: $(HOST_LUAROCKS) $(HOST_LUAROCKS): $(HOST_LUA) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR) - $(REMOVE)/$(HOST_LUAROCKS_TMP) + $(REMOVE)/$(HOST_LUAROCKS_DIR) $(UNTAR)/$(HOST_LUAROCKS_SOURCE) - $(CHDIR)/$(HOST_LUAROCKS_TMP); \ + $(CHDIR)/$(HOST_LUAROCKS_DIR); \ $(call apply_patches, $(HOST_LUAROCKS_PATCH)); \ ./configure $(SILENT_OPT) \ --prefix=$(HOST_DIR) \ @@ -367,7 +367,7 @@ $(HOST_LUAROCKS): $(HOST_LUA) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR) $(MAKE); \ $(MAKE) install cat $(CONFIGS)/luarocks-config.lua >> $(HOST_LUAROCKS_CONFIG_FILE) - $(REMOVE)/$(HOST_LUAROCKS_TMP) + $(REMOVE)/$(HOST_LUAROCKS_DIR) # ----------------------------------------------------------------------------- diff --git a/make/images.mk b/make/images.mk index 6cf3a47a..ee3b4326 100644 --- a/make/images.mk +++ b/make/images.mk @@ -115,17 +115,17 @@ endif flash-image-hd5x: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) flash-image-hd5x: | $(IMAGE_DIR) - rm -rf $(IMAGE_BUILD_TMP) - mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) - cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel.bin + rm -rf $(IMAGE_BUILD_DIR) + mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) + cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel.bin $(CD) $(ROOTFS); \ - tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ - bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar + tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ + bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar # Create minimal image - $(CD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR); \ + $(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \ tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel.bin rootfs.tar.bz2 echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE) - rm -rf $(IMAGE_BUILD_TMP) + rm -rf $(IMAGE_BUILD_DIR) # ----------------------------------------------------------------------------- @@ -136,7 +136,7 @@ HD5x_IMAGE_LINK = $(HD5x_IMAGE_NAME).ext4 # emmc image EMMC_IMAGE_SIZE = 3817472 -EMMC_IMAGE = $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_NAME).img +EMMC_IMAGE = $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_NAME).img BLOCK_SIZE = 512 BLOCK_SECTOR = 2 @@ -166,13 +166,13 @@ STORAGE_PARTITION_OFFSET = "$(shell expr $(LINUX_SWAP_PARTITION_OFFSET) \+ $(LIN #STORAGE_PARTITION_SIZE = 204800 # remaining flash memory flash-image-hd5x-multi: | $(IMAGE_DIR) - rm -rf $(IMAGE_BUILD_TMP) - mkdir -p $(IMAGE_BUILD_TMP) + rm -rf $(IMAGE_BUILD_DIR) + mkdir -p $(IMAGE_BUILD_DIR) # Create a sparse image block - dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) seek=$(shell expr $(ROOTFS_PARTITION_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE) - mkfs.ext4 -v -F $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) -d $(ROOTFS)/.. + dd if=/dev/zero of=$(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) seek=$(shell expr $(ROOTFS_PARTITION_SIZE) \* $(BLOCK_SECTOR)) count=0 bs=$(BLOCK_SIZE) + mkfs.ext4 -v -F $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) -d $(ROOTFS)/.. # Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected) - fsck.ext4 -pvfD $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) || [ $? -le 3 ] + fsck.ext4 -pvfD $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) || [ $? -le 3 ] dd if=/dev/zero of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) count=0 seek=$(shell expr $(EMMC_IMAGE_SIZE) \* $(BLOCK_SECTOR)) parted -s $(EMMC_IMAGE) mklabel gpt parted -s $(EMMC_IMAGE) unit KiB mkpart boot fat16 $(IMAGE_ROOTFS_ALIGNMENT) $(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \+ $(BOOT_PARTITION_SIZE)) @@ -184,52 +184,52 @@ flash-image-hd5x-multi: | $(IMAGE_DIR) parted -s $(EMMC_IMAGE) unit KiB mkpart userdata ext4 $(MULTI_ROOTFS_PARTITION_OFFSET) $(shell expr $(MULTI_ROOTFS_PARTITION_OFFSET) \+ $(MULTI_ROOTFS_PARTITION_SIZE)) parted -s $(EMMC_IMAGE) unit KiB mkpart swap linux-swap $(LINUX_SWAP_PARTITION_OFFSET) $(shell expr $(LINUX_SWAP_PARTITION_OFFSET) \+ $(LINUX_SWAP_PARTITION_SIZE)) parted -s $(EMMC_IMAGE) unit KiB mkpart storage ext4 $(STORAGE_PARTITION_OFFSET) 100% - dd if=/dev/zero of=$(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR)) - mkfs.msdos -S 512 $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) - echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP - echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_1 - echo "boot emmcflash0.linuxkernel2 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs2 kernel=/dev/mmcblk0p4 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_2 - echo "boot emmcflash0.linuxkernel3 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs3 kernel=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_3 - echo "boot emmcflash0.linuxkernel4 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs4 kernel=/dev/mmcblk0p6 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_TMP)/STARTUP_4 - mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP :: - mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_1 :: - mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_2 :: - mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_3 :: - mcopy -i $(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_TMP)/STARTUP_4 :: - dd conv=notrunc if=$(IMAGE_BUILD_TMP)/$(HD5x_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR)) + dd if=/dev/zero of=$(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) bs=$(BLOCK_SIZE) count=$(shell expr $(BOOT_PARTITION_SIZE) \* $(BLOCK_SECTOR)) + mkfs.msdos -S 512 $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) + echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP + echo "boot emmcflash0.linuxkernel 'root=/dev/mmcblk0p3 rootsubdir=linuxrootfs1 kernel=/dev/mmcblk0p2 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP_1 + echo "boot emmcflash0.linuxkernel2 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs2 kernel=/dev/mmcblk0p4 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP_2 + echo "boot emmcflash0.linuxkernel3 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs3 kernel=/dev/mmcblk0p5 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP_3 + echo "boot emmcflash0.linuxkernel4 'root=/dev/mmcblk0p7 rootsubdir=linuxrootfs4 kernel=/dev/mmcblk0p6 rw rootwait $(BOXMODEL)_4.boxmode=1'" > $(IMAGE_BUILD_DIR)/STARTUP_4 + mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP :: + mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_1 :: + mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_2 :: + mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_3 :: + mcopy -i $(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_4 :: + dd conv=notrunc if=$(IMAGE_BUILD_DIR)/$(HD5x_BOOT_IMAGE) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(IMAGE_ROOTFS_ALIGNMENT) \* $(BLOCK_SECTOR)) dd conv=notrunc if=$(KERNEL_ZIMAGE_DTB) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(KERNEL_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) - resize2fs $(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE)k + resize2fs $(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) $(ROOTFS_PARTITION_SIZE)k # Truncate on purpose - dd if=$(IMAGE_BUILD_TMP)/$(HD5x_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) + dd if=$(IMAGE_BUILD_DIR)/$(HD5x_IMAGE_LINK) of=$(EMMC_IMAGE) bs=$(BLOCK_SIZE) seek=$(shell expr $(ROOTFS_PARTITION_OFFSET) \* $(BLOCK_SECTOR)) # Create final USB-image - mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) - cp $(EMMC_IMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) - cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash.bin - cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel.bin + mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) + cp $(EMMC_IMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) + cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash.bin + cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel.bin $(CD) $(ROOTFS); \ - tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ - bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar - echo $(IMAGE_PREFIX) > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/imageversion - $(CD) $(IMAGE_BUILD_TMP); \ + tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ + bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar + echo $(IMAGE_PREFIX) > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/imageversion + $(CD) $(IMAGE_BUILD_DIR); \ zip -r $(IMAGE_DIR)/$(IMAGE_NAME)_multi_usb.zip $(IMAGE_SUBDIR)/* - rm -rf $(IMAGE_BUILD_TMP) + rm -rf $(IMAGE_BUILD_DIR) # ----------------------------------------------------------------------------- # hd60, hd61 flash-image-hd6x: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) flash-image-hd6x: | $(IMAGE_DIR) - rm -rf $(IMAGE_BUILD_TMP) - mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) - cp $(KERNEL_UIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/uImage + rm -rf $(IMAGE_BUILD_DIR) + mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) + cp $(KERNEL_UIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/uImage $(CD) $(ROOTFS); \ - tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ - bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar + tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ + bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar # Create minimal image - $(CD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR); \ + $(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \ tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz uImage rootfs.tar.bz2 echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE) - rm -rf $(IMAGE_BUILD_TMP) + rm -rf $(IMAGE_BUILD_DIR) # ----------------------------------------------------------------------------- @@ -240,47 +240,47 @@ flash-image-hd6x-multi: # armbox vu+ flash-image-vuplus: IMAGE_DATE=$(shell cat $(ROOTFS)/.version | grep "^version=" | cut -d= -f2 | cut -c 5-) flash-image-vuplus: | $(IMAGE_DIR) - rm -rf $(IMAGE_BUILD_TMP) - mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR) - cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel_auto.bin + rm -rf $(IMAGE_BUILD_DIR) + mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) + cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin $(CD) $(ROOTFS); \ - tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ - bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar + tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \ + bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar # Create minimal image - $(CD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR); \ + $(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \ tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel_auto.bin rootfs.tar.bz2 echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE) - rm -rf $(IMAGE_BUILD_TMP) + rm -rf $(IMAGE_BUILD_DIR) flash-image-vuplus-multi: vmlinuz-initrd 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_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 - cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel3_auto.bin - cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel4_auto.bin - echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar.bz2 + rm -rf $(IMAGE_BUILD_DIR) + mkdir -p $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR) + cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/splash_auto.bin + cp $(BUILD_DIR)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/initrd_auto.bin + echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel_auto.bin + cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel1_auto.bin + cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel2_auto.bin + cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel3_auto.bin + cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/kernel4_auto.bin + echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar.bz2 $(CD) $(ROOTFS); \ - tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs1.tar -C $(ROOTFS) . >/dev/null 2>&1; \ - bzip2 $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs1.tar - echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs2.tar.bz2 - echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs3.tar.bz2 - echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs4.tar.bz2 + tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs1.tar -C $(ROOTFS) . >/dev/null 2>&1; \ + bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs1.tar + echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs2.tar.bz2 + echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs3.tar.bz2 + echo Dummy for update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs4.tar.bz2 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuzero4k vuuno4k)) - echo This file forces the update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/force.update + echo This file forces the update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/force.update else - echo This file forces a reboot after the update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/reboot.update + echo This file forces a reboot after the update. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/reboot.update endif - echo This file forces creating partitions. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/mkpart.update - echo $(IMAGE_PREFIX) > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/imageversion + echo This file forces creating partitions. > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/mkpart.update + echo $(IMAGE_PREFIX) > $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/imageversion # Create final USB-image - $(CD) $(IMAGE_BUILD_TMP); \ + $(CD) $(IMAGE_BUILD_DIR); \ zip -r $(IMAGE_DIR)/$(IMAGE_NAME)_multi_usb.zip $(IMAGE_SUBDIR)/* - rm -rf $(IMAGE_BUILD_TMP) + rm -rf $(IMAGE_BUILD_DIR) # ----------------------------------------------------------------------------- diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index 1a86d7ba..7bb90efb 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -21,7 +21,7 @@ rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- HD6x-MALI-DRIVERS_VER = DX910-SW-99002-r7p0-00rel0 -HD6x-MALI-DRIVERS_TMP = $(HD6x-MALI-DRIVERS_VER) +HD6x-MALI-DRIVERS_DIR = $(HD6x-MALI-DRIVERS_VER) HD6x-MALI-DRIVERS_SOURCE = $(HD6x-MALI-DRIVERS_VER).tgz HD6x-MALI-DRIVERS_SITE = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu @@ -31,7 +31,7 @@ $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE): HD6x-MALI-DRIVERS_PATCH = hi3798mv200-support.patch HD6x-MALI-DRIVERS_MAKEVARS = \ - M=$(BUILD_DIR)/$(HD6x-MALI-DRIVERS_TMP)/driver/src/devicedrv/mali \ + M=$(BUILD_DIR)/$(HD6x-MALI-DRIVERS_DIR)/driver/src/devicedrv/mali \ EXTRA_CFLAGS="-DCONFIG_MALI_DVFS=y -DCONFIG_GPU_AVS_ENABLE=y" \ CONFIG_MALI_SHARED_INTERRUPTS=y \ CONFIG_MALI400=m \ @@ -41,12 +41,12 @@ HD6x-MALI-DRIVERS_MAKEVARS = \ hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE) | $(TARGET_DIR) $(START_BUILD) - $(REMOVE)/$(HD6x-MALI-DRIVERS_TMP) + $(REMOVE)/$(HD6x-MALI-DRIVERS_DIR) $(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE) - $(CHDIR)/$(HD6x-MALI-DRIVERS_TMP); \ + $(CHDIR)/$(HD6x-MALI-DRIVERS_DIR); \ $(call apply_patches, $(HD6x-MALI-DRIVERS_PATCH)); \ $(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) + $(REMOVE)/$(HD6x-MALI-DRIVERS_DIR) $(TOUCH) diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index 4b4749db..f39391db 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -218,19 +218,19 @@ endif kernel.do_prepare.git: $(MAKE) kernel.do_checkout # - $(REMOVE)/$(KERNEL_TMP) + $(REMOVE)/$(KERNEL_DIR) tar -C $(SOURCE_DIR) -cp $(NI-LINUX-KERNEL) --exclude-vcs | tar -C $(BUILD_DIR) -x $(CD) $(BUILD_DIR); \ - mv $(NI-LINUX-KERNEL) $(KERNEL_TMP) + mv $(NI-LINUX-KERNEL) $(KERNEL_DIR) kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE) - $(REMOVE)/$(KERNEL_TMP) + $(REMOVE)/$(KERNEL_DIR) $(UNTAR)/$(KERNEL_SOURCE) - $(CHDIR)/$(KERNEL_TMP); \ + $(CHDIR)/$(KERNEL_DIR); \ $(call apply_patches, $(addprefix kernel/,$(KERNEL_PATCH))) kernel.do_compile: kernel.do_prepare - $(CHDIR)/$(KERNEL_TMP); \ + $(CHDIR)/$(KERNEL_DIR); \ $(MAKE) $(KERNEL_MAKEVARS) silentoldconfig; \ $(MAKE) $(KERNEL_MAKEVARS) $(KERNEL_MAKEOPTS); \ $(MAKE) $(KERNEL_MAKEVARS) modules_install diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index 9cc853b0..a0c37e9f 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -179,18 +179,18 @@ doscam-webif-skin: # ----------------------------------------------------------------------------- NEUTRINO-MEDIATHEK_VER = git -NEUTRINO-MEDIATHEK_TMP = mediathek.$(NEUTRINO-MEDIATHEK_VER) +NEUTRINO-MEDIATHEK_DIR = mediathek.$(NEUTRINO-MEDIATHEK_VER) NEUTRINO-MEDIATHEK_SOURCE = mediathek.$(NEUTRINO-MEDIATHEK_VER) NEUTRINO-MEDIATHEK_SITE = https://github.com/neutrino-mediathek neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR) - $(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP) + $(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR) $(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_SITE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(DL_DIR)/$(NEUTRINO-MEDIATHEK_SOURCE) $(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE) - $(CHDIR)/$(NEUTRINO-MEDIATHEK_TMP); \ + $(CHDIR)/$(NEUTRINO-MEDIATHEK_DIR); \ $(INSTALL_COPY) plugins/* $(SHARE_PLUGINS)/; \ $(INSTALL_COPY) share $(TARGET_DIR) - $(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP) + $(REMOVE)/$(NEUTRINO-MEDIATHEK_DIR) # temporarily use beta-version from our board rm -rf $(SHARE_PLUGINS)/neutrino-mediathek* $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/plugins/mediathek/* $(SHARE_PLUGINS)/ @@ -199,7 +199,7 @@ neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR) # ----------------------------------------------------------------------------- LINKS_VER = 2.20.2 -LINKS_TMP = links-$(LINKS_VER) +LINKS_DIR = links-$(LINKS_VER) LINKS_SOURCE = links-$(LINKS_VER).tar.bz2 LINKS_SITE = http://links.twibright.com/download @@ -221,14 +221,14 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), h7)) endif links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) - $(REMOVE)/$(LINKS_TMP) + $(REMOVE)/$(LINKS_DIR) $(UNTAR)/$(LINKS_SOURCE) - $(CHDIR)/$(LINKS_TMP)/intl; \ + $(CHDIR)/$(LINKS_DIR)/intl; \ sed -i -e 's|^T_SAVE_HTML_OPTIONS,.*|T_SAVE_HTML_OPTIONS, "HTML-Optionen speichern",|' german.lng; \ echo "english" > index.txt; \ echo "german" >> index.txt; \ ./gen-intl - $(CHDIR)/$(LINKS_TMP); \ + $(CHDIR)/$(LINKS_DIR); \ $(call apply_patches, $(LINKS_PATCH)); \ autoreconf -vfi; \ $(CONFIGURE) \ @@ -250,7 +250,7 @@ links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) mv -f $(TARGET_BIN_DIR)/links $(SHARE_PLUGINS)/links.so $(INSTALL_COPY) $(TARGET_FILES)/links/* $(TARGET_DIR)/ - $(REMOVE)/$(LINKS_TMP) + $(REMOVE)/$(LINKS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- diff --git a/make/target-blobs.mk b/make/target-blobs.mk index cf206427..90b3efeb 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -176,27 +176,27 @@ vuplus-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- HD51-LIBGLES_VER = 20191101 -HD51-LIBGLES_TMP = $(EMPTY) +HD51-LIBGLES_DIR = $(EMPTY) HD51-LIBGLES_SOURCE = hd51-v3ddriver-$(HD51-LIBGLES_VER).zip HD51-LIBGLES_SITE = http://downloads.mutant-digital.net/v3ddriver BRE2ZE4K-LIBGLES_VER = 20191101 -BRE2ZE4K-LIBGLES_TMP = $(EMPTY) +BRE2ZE4K-LIBGLES_DIR = $(EMPTY) BRE2ZE4K-LIBGLES_SOURCE = bre2ze4k-v3ddriver-$(BRE2ZE4K-LIBGLES_VER).zip BRE2ZE4K-LIBGLES_SITE = http://downloads.mutant-digital.net/v3ddriver H7-LIBGLES_VER = 20191110 -H7-LIBGLES_TMP = $(EMPTY) +H7-LIBGLES_DIR = $(EMPTY) H7-LIBGLES_SOURCE = h7-v3ddriver-$(H7-LIBGLES_VER).zip H7-LIBGLES_SITE = http://source.mynonpublic.com/zgemma HD60-LIBGLES_VER = 20181201 -HD60-LIBGLES_TMP = $(EMPTY) +HD60-LIBGLES_DIR = $(EMPTY) HD60-LIBGLES_SOURCE = hd60-mali-$(HD60-LIBGLES_VER).zip HD60-LIBGLES_SITE = http://downloads.mutant-digital.net/hd60 HD61-LIBGLES_VER = 20181201 -HD61-LIBGLES_TMP = $(EMPTY) +HD61-LIBGLES_DIR = $(EMPTY) HD61-LIBGLES_SOURCE = hd61-mali-$(HD61-LIBGLES_VER).zip HD61-LIBGLES_SITE = http://downloads.mutant-digital.net/hd61 @@ -204,44 +204,44 @@ HD6x-LIBGLES-HEADERS_SOURCE = libgles-mali-utgard-headers.zip HD6x-LIBGLES-HEADERS_SITE = https://github.com/HD-Digital/meta-gfutures/raw/release-6.2/recipes-bsp/mali/files VUSOLO4K-LIBGLES_VER = $(VUSOLO4K-DRIVERS_VER) -VUSOLO4K-LIBGLES_TMP = libgles-vusolo4k +VUSOLO4K-LIBGLES_DIR = libgles-vusolo4k VUSOLO4K-LIBGLES_SOURCE = libgles-vusolo4k-17.1-$(VUSOLO4K-LIBGLES_VER).r0.tar.gz VUSOLO4K-LIBGLES_SITE = http://archive.vuplus.com/download/build_support/vuplus VUDUO4K-LIBGLES_VER = $(VUDUO4K-DRIVERS_VER) -VUDUO4K-LIBGLES_TMP = libgles-vuduo4k +VUDUO4K-LIBGLES_DIR = libgles-vuduo4k VUDUO4K-LIBGLES_SOURCE = libgles-vuduo4k-18.1-$(VUDUO4K-LIBGLES_VER).r0.tar.gz VUDUO4K-LIBGLES_SITE = http://archive.vuplus.com/download/build_support/vuplus VUDUO4KSE-LIBGLES_VER = $(VUDUO4KSE-DRIVERS_VER) -VUDUO4KSE-LIBGLES_TMP = libgles-vuduo4kse +VUDUO4KSE-LIBGLES_DIR = libgles-vuduo4kse VUDUO4KSE-LIBGLES_SOURCE = libgles-vuduo4kse-17.1-$(VUDUO4KSE-LIBGLES_VER).r0.tar.gz VUDUO4KSE-LIBGLES_SITE = http://archive.vuplus.com/download/build_support/vuplus VUULTIMO4K-LIBGLES_VER = $(VUULTIMO4K-DRIVERS_VER) -VUULTIMO4K-LIBGLES_TMP = libgles-vuultimo4k +VUULTIMO4K-LIBGLES_DIR = libgles-vuultimo4k VUULTIMO4K-LIBGLES_SOURCE = libgles-vuultimo4k-17.1-$(VUULTIMO4K-LIBGLES_VER).r0.tar.gz VUULTIMO4K-LIBGLES_SITE = http://archive.vuplus.com/download/build_support/vuplus VUZERO4K-LIBGLES_VER = $(VUZERO4K-DRIVERS_VER) -VUZERO4K-LIBGLES_TMP = libgles-vuzero4k +VUZERO4K-LIBGLES_DIR = libgles-vuzero4k VUZERO4K-LIBGLES_SOURCE = libgles-vuzero4k-17.1-$(VUZERO4K-LIBGLES_VER).r0.tar.gz VUZERO4K-LIBGLES_SITE = http://archive.vuplus.com/download/build_support/vuplus VUUNO4K-LIBGLES_VER = $(VUUNO4K-DRIVERS_VER) -VUUNO4K-LIBGLES_TMP = libgles-vuuno4k +VUUNO4K-LIBGLES_DIR = libgles-vuuno4k VUUNO4K-LIBGLES_SOURCE = libgles-vuuno4k-17.1-$(VUUNO4K-LIBGLES_VER).r0.tar.gz VUUNO4K-LIBGLES_SITE = http://archive.vuplus.com/download/build_support/vuplus VUUNO4KSE-LIBGLES_VER = $(VUUNO4KSE-DRIVERS_VER) -VUUNO4KSE-LIBGLES_TMP = libgles-vuuno4kse +VUUNO4KSE-LIBGLES_DIR = libgles-vuuno4kse VUUNO4KSE-LIBGLES_SOURCE = libgles-vuuno4kse-17.1-$(VUUNO4KSE-LIBGLES_VER).r0.tar.gz VUUNO4KSE-LIBGLES_SITE = http://archive.vuplus.com/download/build_support/vuplus # ----------------------------------------------------------------------------- BOXMODEL-LIBGLES_VER = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_VER) -BOXMODEL-LIBGLES_TMP = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_TMP) +BOXMODEL-LIBGLES_DIR = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_DIR) BOXMODEL-LIBGLES_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SOURCE) BOXMODEL-LIBGLES_SITE = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SITE) @@ -285,31 +285,31 @@ vuzero4k-libgles \ vuuno4k-libgles \ vuuno4kse-libgles \ vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BOXMODEL-LIBGLES_TMP) + $(REMOVE)/$(BOXMODEL-LIBGLES_DIR) $(UNTAR)/$(BOXMODEL-LIBGLES_SOURCE) - $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_TMP)/lib/* $(TARGET_LIB_DIR) + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/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_DIR)/$(BOXMODEL-LIBGLES_TMP)/include/* $(TARGET_INCLUDE_DIR) - $(REMOVE)/$(BOXMODEL-LIBGLES_TMP) + $(INSTALL_COPY) $(BUILD_DIR)/$(BOXMODEL-LIBGLES_DIR)/include/* $(TARGET_INCLUDE_DIR) + $(REMOVE)/$(BOXMODEL-LIBGLES_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HD60-LIBS_VER = 20200622 -HD60-LIBS_TMP = hiplay +HD60-LIBS_DIR = hiplay HD60-LIBS_SOURCE = gfutures-libs-3798mv200-$(HD60-LIBS_VER).zip HD60-LIBS_SITE = http://source.mynonpublic.com/gfutures HD61-LIBS_VER = 20200622 -HD61-LIBS_TMP = hiplay +HD61-LIBS_DIR = hiplay HD61-LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61-LIBS_VER).zip HD61-LIBS_SITE = http://source.mynonpublic.com/gfutures # ----------------------------------------------------------------------------- BOXMODEL-LIBS_VER = $($(call UPPERCASE,$(BOXMODEL))-LIBS_VER) -BOXMODEL-LIBS_TMP = $($(call UPPERCASE,$(BOXMODEL))-LIBS_TMP) +BOXMODEL-LIBS_DIR = $($(call UPPERCASE,$(BOXMODEL))-LIBS_DIR) BOXMODEL-LIBS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SOURCE) BOXMODEL-LIBS_SITE = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SITE) @@ -320,56 +320,56 @@ 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_DIR)/$(BOXMODEL-LIBS_TMP) + $(REMOVE)/$(BOXMODEL-LIBS_DIR) + unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR) mkdir -p $(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 + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/hisilicon/* $(TARGET_USR_LIB_DIR)/hisilicon + $(INSTALL_EXEC) $(BUILD_DIR)/$(BOXMODEL-LIBS_DIR)/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) + $(REMOVE)/$(BOXMODEL-LIBS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- VUSOLO4K-PLATFORM-UTIL_VER = $(VUSOLO4K-DRIVERS_VER) -VUSOLO4K-PLATFORM-UTIL_TMP = platform-util-vusolo4k +VUSOLO4K-PLATFORM-UTIL_DIR = platform-util-vusolo4k VUSOLO4K-PLATFORM-UTIL_SOURCE = platform-util-vusolo4k-17.1-$(VUSOLO4K-PLATFORM-UTIL_VER).r0.tar.gz VUSOLO4K-PLATFORM-UTIL_SITE = http://archive.vuplus.com/download/build_support/vuplus VUDUO4K-PLATFORM-UTIL_VER = $(VUDUO4K-DRIVERS_VER) -VUDUO4K-PLATFORM-UTIL_TMP = platform-util-vuduo4k +VUDUO4K-PLATFORM-UTIL_DIR = platform-util-vuduo4k VUDUO4K-PLATFORM-UTIL_SOURCE = platform-util-vuduo4k-18.1-$(VUDUO4K-PLATFORM-UTIL_VER).r0.tar.gz VUDUO4K-PLATFORM-UTIL_SITE = http://archive.vuplus.com/download/build_support/vuplus VUDUO4KSE-PLATFORM-UTIL_VER = $(VUDUO4KSE-DRIVERS_VER) -VUDUO4KSE-PLATFORM-UTIL_TMP = platform-util-vuduo4kse +VUDUO4KSE-PLATFORM-UTIL_DIR = platform-util-vuduo4kse VUDUO4KSE-PLATFORM-UTIL_SOURCE = platform-util-vuduo4kse-17.1-$(VUDUO4KSE-PLATFORM-UTIL_VER).r0.tar.gz VUDUO4KSE-PLATFORM-UTIL_SITE = http://archive.vuplus.com/download/build_support/vuplus VUULTIMO4K-PLATFORM-UTIL_VER = $(VUULTIMO4K-DRIVERS_VER) -VUULTIMO4K-PLATFORM-UTIL_TMP = platform-util-vuultimo4k +VUULTIMO4K-PLATFORM-UTIL_DIR = platform-util-vuultimo4k VUULTIMO4K-PLATFORM-UTIL_SOURCE = platform-util-vuultimo4k-17.1-$(VUULTIMO4K-PLATFORM-UTIL_VER).r0.tar.gz VUULTIMO4K-PLATFORM-UTIL_SITE = http://archive.vuplus.com/download/build_support/vuplus VUZERO4K-PLATFORM-UTIL_VER = $(VUZERO4K-DRIVERS_VER) -VUZERO4K-PLATFORM-UTIL_TMP = platform-util-vuzero4k +VUZERO4K-PLATFORM-UTIL_DIR = platform-util-vuzero4k VUZERO4K-PLATFORM-UTIL_SOURCE = platform-util-vuzero4k-17.1-$(VUZERO4K-PLATFORM-UTIL_VER).r0.tar.gz VUZERO4K-PLATFORM-UTIL_SITE = http://archive.vuplus.com/download/build_support/vuplus VUUNO4K-PLATFORM-UTIL_VER = $(VUUNO4K-DRIVERS_VER) -VUUNO4K-PLATFORM-UTIL_TMP = platform-util-vuuno4k +VUUNO4K-PLATFORM-UTIL_DIR = platform-util-vuuno4k VUUNO4K-PLATFORM-UTIL_SOURCE = platform-util-vuuno4k-17.1-$(VUUNO4K-PLATFORM-UTIL_VER).r0.tar.gz VUUNO4K-PLATFORM-UTIL_SITE = http://archive.vuplus.com/download/build_support/vuplus VUUNO4KSE-PLATFORM-UTIL_VER = $(VUUNO4KSE-DRIVERS_VER) -VUUNO4KSE-PLATFORM-UTIL_TMP = platform-util-vuuno4kse +VUUNO4KSE-PLATFORM-UTIL_DIR = platform-util-vuuno4kse VUUNO4KSE-PLATFORM-UTIL_SOURCE = platform-util-vuuno4kse-17.1-$(VUUNO4KSE-PLATFORM-UTIL_VER).r0.tar.gz VUUNO4KSE-PLATFORM-UTIL_SITE = http://archive.vuplus.com/download/build_support/vuplus # ----------------------------------------------------------------------------- BOXMODEL-PLATFORM-UTIL_VER = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_VER) -BOXMODEL-PLATFORM-UTIL_TMP = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_TMP) +BOXMODEL-PLATFORM-UTIL_DIR = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_DIR) BOXMODEL-PLATFORM-UTIL_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SOURCE) BOXMODEL-PLATFORM-UTIL_SITE = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SITE) @@ -379,12 +379,12 @@ $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE): endif vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP) + $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR) $(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_USR_BIN_DIR) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(BOXMODEL-PLATFORM-UTIL_DIR)/* $(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 endif - $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP) + $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_DIR) $(TOUCH) diff --git a/make/target-development.mk b/make/target-development.mk index 22e79d5f..58b98489 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -11,7 +11,7 @@ valgrind: $(VALGRIND_TARGET) # ----------------------------------------------------------------------------- VALGRIND_VER = 3.13.0 -VALGRIND_TMP = valgrind-$(VALGRIND_VER) +VALGRIND_DIR = valgrind-$(VALGRIND_VER) VALGRIND_SOURCE = valgrind-$(VALGRIND_VER).tar.bz2 VALGRIND_SITE = ftp://sourceware.org/pub/valgrind @@ -21,9 +21,9 @@ $(DL_DIR)/$(VALGRIND_SOURCE): VALGRIND_PATCH = valgrind-fix-build-$(TARGET_ARCH).patch valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(VALGRIND_TMP) + $(REMOVE)/$(VALGRIND_DIR) $(UNTAR)/$(VALGRIND_SOURCE) - $(CHDIR)/$(VALGRIND_TMP); \ + $(CHDIR)/$(VALGRIND_DIR); \ $(call apply_patches, $(VALGRIND_PATCH)); \ export AR=$(TARGET_AR); \ autoreconf -fi; \ @@ -38,7 +38,7 @@ valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) $(REWRITE_PKGCONF_PC) rm -f $(addprefix $(TARGET_LIB_DIR)/valgrind/,*.a *.xml) rm -f $(addprefix $(TARGET_BIN_DIR)/,cg_* callgrind_* ms_print) - $(REMOVE)/$(VALGRIND_TMP) + $(REMOVE)/$(VALGRIND_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -68,7 +68,7 @@ valgrind12305: | $(TARGET_DIR) # ----------------------------------------------------------------------------- STRACE_VER = 5.1 -STRACE_TMP = strace-$(STRACE_VER) +STRACE_DIR = strace-$(STRACE_VER) STRACE_SOURCE = strace-$(STRACE_VER).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VER) @@ -76,9 +76,9 @@ $(DL_DIR)/$(STRACE_SOURCE): $(DOWNLOAD) $(STRACE_SITE)/$(STRACE_SOURCE) strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(STRACE_TMP) + $(REMOVE)/$(STRACE_DIR) $(UNTAR)/$(STRACE_SOURCE) - $(CHDIR)/$(STRACE_TMP); \ + $(CHDIR)/$(STRACE_DIR); \ $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ @@ -87,13 +87,13 @@ strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR) $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -f $(addprefix $(TARGET_BIN_DIR)/,strace-graph strace-log-merge) - $(REMOVE)/$(STRACE_TMP) + $(REMOVE)/$(STRACE_DIR) $(TOUCH) # ----------------------------------------------------------------------------- GDB_VER = 8.3 -GDB_TMP = gdb-$(GDB_VER) +GDB_DIR = gdb-$(GDB_VER) GDB_SOURCE = gdb-$(GDB_VER).tar.xz GDB_SITE = https://sourceware.org/pub/gdb/releases @@ -103,9 +103,9 @@ $(DL_DIR)/$(GDB_SOURCE): GDB_DEPS = zlib ncurses gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GDB_TMP) + $(REMOVE)/$(GDB_DIR) $(UNTAR)/$(GDB_SOURCE) - $(CHDIR)/$(GDB_TMP); \ + $(CHDIR)/$(GDB_DIR); \ $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ @@ -127,5 +127,5 @@ gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR) $(MAKE) install-gdb DESTDIR=$(TARGET_DIR) rm -rf $(addprefix $(TARGET_SHARE_DIR)/,system-gdbinit) find $(TARGET_SHARE_DIR)/gdb/syscalls -type f -not -name 'arm-linux.xml' -not -name 'gdb-syscalls.dtd' -print0 | xargs -0 rm -- - $(REMOVE)/$(GDB_TMP) + $(REMOVE)/$(GDB_DIR) $(TOUCH) diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk index 5f2f86a0..8f01f127 100644 --- a/make/target-ffmpeg.mk +++ b/make/target-ffmpeg.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- FFMPEG_VER = 4.3 -FFMPEG_TMP = ffmpeg-$(FFMPEG_VER) +FFMPEG_DIR = ffmpeg-$(FFMPEG_VER) FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VER).tar.xz FFMPEG_SITE = http://www.ffmpeg.org/releases @@ -343,13 +343,13 @@ endif # ----------------------------------------------------------------------------- ffmpeg: $(FFMPEG_DEPS) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FFMPEG_TMP) + $(REMOVE)/$(FFMPEG_DIR) $(UNTAR)/$(FFMPEG_SOURCE) ifneq ($(FFMPEG_UNPATCHED), yes) - $(CHDIR)/$(FFMPEG_TMP); \ + $(CHDIR)/$(FFMPEG_DIR); \ $(APPLY_PATCHES) endif - $(CHDIR)/$(FFMPEG_TMP); \ + $(CHDIR)/$(FFMPEG_DIR); \ ./configure \ $(FFMPEG_CONFIGURE_GENERIC) \ $(FFMPEG_CONFIGURE_PLATFORM) \ @@ -357,5 +357,5 @@ endif $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(FFMPEG_TMP) + $(REMOVE)/$(FFMPEG_DIR) $(TOUCH) diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk index 8da3946b..8abb71e9 100644 --- a/make/target-libs-static.mk +++ b/make/target-libs-static.mk @@ -13,7 +13,7 @@ libs-static: $(LIBS-STATIC) # ----------------------------------------------------------------------------- CORTEX-STRINGS_VER = 48fd30c -CORTEX-STRINGS_TMP = cortex-strings-$(CORTEX-STRINGS_VER) +CORTEX-STRINGS_DIR = cortex-strings-$(CORTEX-STRINGS_VER) CORTEX-STRINGS_SOURCE = cortex-strings-$(CORTEX-STRINGS_VER).tar.bz2 CORTEX-STRINGS_SITE = http://git.linaro.org/git-ro/toolchain/cortex-strings.git @@ -24,9 +24,9 @@ CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k v cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la $(STATIC_LIB_DIR)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR) - $(REMOVE)/$(CORTEX-STRINGS_TMP) + $(REMOVE)/$(CORTEX-STRINGS_DIR) $(UNTAR)/$(CORTEX-STRINGS_SOURCE) - $(CHDIR)/$(CORTEX-STRINGS_TMP); \ + $(CHDIR)/$(CORTEX-STRINGS_DIR); \ ./autogen.sh; \ CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \ CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_INCLUDE_DIR)" \ @@ -42,7 +42,7 @@ $(STATIC_LIB_DIR)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(S $(MAKE); \ $(MAKE) install DESTDIR=$(STATIC_DIR) $(REWRITE_LIBTOOL_STATIC)/libcortex-strings.la - $(REMOVE)/$(CORTEX-STRINGS_TMP) + $(REMOVE)/$(CORTEX-STRINGS_DIR) # ----------------------------------------------------------------------------- diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index 1c477c9f..308b49af 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- LIBID3TAG_VER = 0.15.1b -LIBID3TAG_TMP = libid3tag-$(LIBID3TAG_VER) +LIBID3TAG_DIR = libid3tag-$(LIBID3TAG_VER) LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VER).tar.gz LIBID3TAG_SITE = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3TAG_VER) @@ -16,9 +16,9 @@ LIBID3TAG_PATCH = libid3tag-pc.patch LIBID3TAG_DEPS = zlib libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBID3TAG_TMP) + $(REMOVE)/$(LIBID3TAG_DIR) $(UNTAR)/$(LIBID3TAG_SOURCE) - $(CHDIR)/$(LIBID3TAG_TMP); \ + $(CHDIR)/$(LIBID3TAG_DIR); \ $(call apply_patches, $(LIBID3TAG_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -29,13 +29,13 @@ libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBID3TAG_TMP) + $(REMOVE)/$(LIBID3TAG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- FLAC_VER = 1.3.2 -FLAC_TMP = flac-$(FLAC_VER) +FLAC_DIR = flac-$(FLAC_VER) FLAC_SOURCE = flac-$(FLAC_VER).tar.xz FLAC_SITE = https://ftp.osuosl.org/pub/xiph/releases/flac @@ -43,9 +43,9 @@ $(DL_DIR)/$(FLAC_SOURCE): $(DOWNLOAD) $(FLAC_SITE)/$(FLAC_SOURCE) libFLAC: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBFLAC_TMP) + $(REMOVE)/$(LIBFLAC_DIR) $(UNTAR)/$(LIBFLAC_SOURCE) - $(CHDIR)/$(LIBFLAC_TMP); \ + $(CHDIR)/$(LIBFLAC_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -63,13 +63,13 @@ libFLAC: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR) $(REWRITE_PKGCONF_PC) rm -rf $(TARGET_DIR)/bin/flac rm -rf $(TARGET_DIR)/bin/metaflac - $(REMOVE)/$(LIBFLAC_TMP) + $(REMOVE)/$(LIBFLAC_DIR) $(TOUCH) # ----------------------------------------------------------------------------- BZIP2_VER = 1.0.8 -BZIP2_TMP = bzip2-$(BZIP2_VER) +BZIP2_DIR = bzip2-$(BZIP2_VER) BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz BZIP2_SITE = https://sourceware.org/pub/bzip2 @@ -79,22 +79,22 @@ $(DL_DIR)/$(BZIP2_SOURCE): BZIP2_PATCH = bzip2.patch bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BZIP2_TMP) + $(REMOVE)/$(BZIP2_DIR) $(UNTAR)/$(BZIP2_SOURCE) - $(CHDIR)/$(BZIP2_TMP); \ + $(CHDIR)/$(BZIP2_DIR); \ $(call apply_patches, $(BZIP2_PATCH)); \ mv Makefile-libbz2_so Makefile; \ $(MAKE_ENV) \ $(MAKE) all; \ $(MAKE) install PREFIX=$(TARGET_DIR) rm -f $(TARGET_DIR)/bin/bzip2 - $(REMOVE)/$(BZIP2_TMP) + $(REMOVE)/$(BZIP2_DIR) $(TOUCH) # ----------------------------------------------------------------------------- FONTCONFIG_VER = 2.11.93 -FONTCONFIG_TMP = fontconfig-$(FONTCONFIG_VER) +FONTCONFIG_DIR = fontconfig-$(FONTCONFIG_VER) FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VER).tar.bz2 FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release @@ -104,9 +104,9 @@ $(DL_DIR)/$(FONTCONFIG_SOURCE): FONTCONFIG_DEPS = freetype expat fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FONTCONFIG_TMP) + $(REMOVE)/$(FONTCONFIG_DIR) $(UNTAR)/$(FONTCONFIG_SOURCE) - $(CHDIR)/$(FONTCONFIG_TMP); \ + $(CHDIR)/$(FONTCONFIG_DIR); \ $(CONFIGURE) \ --prefix= \ --with-freetype-config=$(HOST_DIR)/bin/freetype-config \ @@ -119,13 +119,13 @@ fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(FONTCONFIG_TMP) + $(REMOVE)/$(FONTCONFIG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- PIXMAN_VER = 0.34.0 -PIXMAN_TMP = pixman-$(PIXMAN_VER) +PIXMAN_DIR = pixman-$(PIXMAN_VER) PIXMAN_SOURCE = pixman-$(PIXMAN_VER).tar.gz PIXMAN_SITE = https://www.cairographics.org/releases @@ -139,9 +139,9 @@ PIXMAN_PATCH += pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us PIXMAN_DEPS = zlib libpng pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PIXMAN_TMP) + $(REMOVE)/$(PIXMAN_DIR) $(UNTAR)/$(PIXMAN_SOURCE) - $(CHDIR)/$(PIXMAN_TMP); \ + $(CHDIR)/$(PIXMAN_DIR); \ $(call apply_patches, $(PIXMAN_PATCH)); \ $(CONFIGURE) \ --prefix= \ @@ -154,13 +154,13 @@ pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(PIXMAN_TMP) + $(REMOVE)/$(PIXMAN_DIR) $(TOUCH) # ----------------------------------------------------------------------------- CAIRO_VER = 1.16.0 -CAIRO_TMP = cairo-$(CAIRO_VER) +CAIRO_DIR = cairo-$(CAIRO_VER) CAIRO_SOURCE = cairo-$(CAIRO_VER).tar.xz CAIRO_SITE = https://www.cairographics.org/releases @@ -172,9 +172,9 @@ CAIRO_PATCH = cairo-get_bitmap_surface.diff CAIRO_DEPS = fontconfig glib2 libpng pixman zlib cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(CAIRO_TMP) + $(REMOVE)/$(CAIRO_DIR) $(UNTAR)/$(CAIRO_SOURCE) - $(CHDIR)/$(CAIRO_TMP); \ + $(CHDIR)/$(CAIRO_DIR); \ $(call apply_patches, $(CAIRO_PATCH)); \ $(MAKE_ENV) \ ax_cv_c_float_words_bigendian="no" \ @@ -197,13 +197,13 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) rm -rf $(TARGET_LIB_DIR)/cairo/.debug/cairo-sphinx* $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(CAIRO_TMP) + $(REMOVE)/$(CAIRO_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HARFBUZZ_VER = 1.8.8 -HARFBUZZ_TMP = harfbuzz-$(HARFBUZZ_VER) +HARFBUZZ_DIR = harfbuzz-$(HARFBUZZ_VER) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VER).tar.bz2 HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release @@ -215,9 +215,9 @@ HARFBUZZ_PATCH = harfbuzz-disable-docs.patch HARFBUZZ_DEPS = fontconfig glib2 cairo freetype harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(HARFBUZZ_TMP) + $(REMOVE)/$(HARFBUZZ_DIR) $(UNTAR)/$(HARFBUZZ_SOURCE) - $(CHDIR)/$(HARFBUZZ_TMP); \ + $(CHDIR)/$(HARFBUZZ_DIR); \ $(call apply_patches, $(HARFBUZZ_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -233,5 +233,5 @@ harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(HARFBUZZ_TMP) + $(REMOVE)/$(HARFBUZZ_DIR) $(TOUCH) diff --git a/make/target-libs.mk b/make/target-libs.mk index 9761fd12..c0990c9a 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- ZLIB_VER = 1.2.11 -ZLIB_TMP = zlib-$(ZLIB_VER) +ZLIB_DIR = zlib-$(ZLIB_VER) ZLIB_SOURCE = zlib-$(ZLIB_VER).tar.xz ZLIB_SITE = https://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VER) @@ -15,9 +15,9 @@ ZLIB_PATCH = zlib-ldflags-tests.patch ZLIB_PATCH += zlib-remove.ldconfig.call.patch zlib: $(DL_DIR)/$(ZLIB_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(ZLIB_TMP) + $(REMOVE)/$(ZLIB_DIR) $(UNTAR)/$(ZLIB_SOURCE) - $(CHDIR)/$(ZLIB_TMP); \ + $(CHDIR)/$(ZLIB_DIR); \ $(call apply_patches, $(ZLIB_PATCH)); \ $(MAKE_ENV) \ mandir=$(remove-mandir) \ @@ -29,13 +29,13 @@ zlib: $(DL_DIR)/$(ZLIB_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(ZLIB_TMP) + $(REMOVE)/$(ZLIB_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBFUSE_VER = 2.9.9 -LIBFUSE_TMP = fuse-$(LIBFUSE_VER) +LIBFUSE_DIR = fuse-$(LIBFUSE_VER) LIBFUSE_SOURCE = fuse-$(LIBFUSE_VER).tar.gz LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VER) @@ -43,9 +43,9 @@ $(DL_DIR)/$(LIBFUSE_SOURCE): $(DOWNLOAD) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE) libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBFUSE_TMP) + $(REMOVE)/$(LIBFUSE_DIR) $(UNTAR)/$(LIBFUSE_SOURCE) - $(CHDIR)/$(LIBFUSE_TMP); \ + $(CHDIR)/$(LIBFUSE_DIR); \ $(CONFIGURE) \ --prefix= \ --datarootdir=$(remove-datarootdir) \ @@ -63,13 +63,13 @@ libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) $(REWRITE_PKGCONF_PC) rm -rf $(TARGET_DIR)/etc/udev rm -rf $(TARGET_DIR)/etc/init.d/fuse - $(REMOVE)/$(LIBFUSE_TMP) + $(REMOVE)/$(LIBFUSE_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBUPNP_VER = 1.6.25 -LIBUPNP_TMP = libupnp-$(LIBUPNP_VER) +LIBUPNP_DIR = libupnp-$(LIBUPNP_VER) LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VER).tar.bz2 LIBUPNP_SITE = http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(LIBUPNP_VER) @@ -77,9 +77,9 @@ $(DL_DIR)/$(LIBUPNP_SOURCE): $(DOWNLOAD) $(LIBUPNP_SITE)/$(LIBUPNP_SOURCE) libupnp: $(DL_DIR)/$(LIBUPNP_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBUPNP_TMP) + $(REMOVE)/$(LIBUPNP_DIR) $(UNTAR)/$(LIBUPNP_SOURCE) - $(CHDIR)/$(LIBUPNP_TMP); \ + $(CHDIR)/$(LIBUPNP_DIR); \ $(CONFIGURE) \ --prefix= \ --enable-shared \ @@ -89,23 +89,23 @@ libupnp: $(DL_DIR)/$(LIBUPNP_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR); \ $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBUPNP_TMP) + $(REMOVE)/$(LIBUPNP_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBDVBSI_VER = git -LIBDVBSI_TMP = libdvbsi.$(LIBDVBSI_VER) +LIBDVBSI_DIR = libdvbsi.$(LIBDVBSI_VER) LIBDVBSI_SOURCE = libdvbsi.$(LIBDVBSI_VER) LIBDVBSI_SITE = https://github.com/OpenVisionE2 LIBDVBSI_PATCH = libdvbsi++-content_identifier_descriptor.patch libdvbsi: | $(TARGET_DIR) - $(REMOVE)/$(LIBDVBSI_TMP) + $(REMOVE)/$(LIBDVBSI_DIR) $(GET-GIT-SOURCE) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE) $(DL_DIR)/$(LIBDVBSI_SOURCE) $(CPDIR)/$(LIBDVBSI_SOURCE) - $(CHDIR)/$(LIBDVBSI_TMP); \ + $(CHDIR)/$(LIBDVBSI_DIR); \ $(call apply_patches, $(LIBDVBSI_PATCH)); \ $(CONFIGURE) \ --prefix= \ @@ -117,13 +117,13 @@ libdvbsi: | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR); \ $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBDVBSI_TMP) + $(REMOVE)/$(LIBDVBSI_DIR) $(TOUCH) # ----------------------------------------------------------------------------- GIFLIB_VER = 5.2.1 -GIFLIB_TMP = giflib-$(GIFLIB_VER) +GIFLIB_DIR = giflib-$(GIFLIB_VER) GIFLIB_SOURCE = giflib-$(GIFLIB_VER).tar.gz GIFLIB_SITE = https://sourceforge.net/projects/giflib/files @@ -131,19 +131,19 @@ $(DL_DIR)/$(GIFLIB_SOURCE): $(DOWNLOAD) $(GIFLIB_SITE)/$(GIFLIB_SOURCE) giflib: $(DL_DIR)/$(GIFLIB_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GIFLIB_TMP) + $(REMOVE)/$(GIFLIB_DIR) $(UNTAR)/$(GIFLIB_SOURCE) - $(CHDIR)/$(GIFLIB_TMP); \ + $(CHDIR)/$(GIFLIB_DIR); \ $(MAKE_ENV) \ $(MAKE); \ $(MAKE) install-include install-lib DESTDIR=$(TARGET_DIR) PREFIX= - $(REMOVE)/$(GIFLIB_TMP) + $(REMOVE)/$(GIFLIB_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBCURL_VER = 7.71.1 -LIBCURL_TMP = curl-$(LIBCURL_VER) +LIBCURL_DIR = curl-$(LIBCURL_VER) LIBCURL_SOURCE = curl-$(LIBCURL_VER).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download @@ -155,9 +155,9 @@ LIBCURL_DEPS = zlib openssl rtmpdump ca-bundle LIBCURL_CONF = $(if $(filter $(BOXSERIES), hd1),--disable-ipv6,--enable-ipv6) libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBCURL_TMP) + $(REMOVE)/$(LIBCURL_DIR) $(UNTAR)/$(LIBCURL_SOURCE) - $(CHDIR)/$(LIBCURL_TMP); \ + $(CHDIR)/$(LIBCURL_DIR); \ $(CONFIGURE) \ --prefix= \ --datarootdir=$(remove-datarootdir) \ @@ -191,13 +191,13 @@ libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) rm -f $(TARGET_SHARE_DIR)/zsh $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBCURL_TMP) + $(REMOVE)/$(LIBCURL_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBPNG_VER = 1.6.37 -LIBPNG_TMP = libpng-$(LIBPNG_VER) +LIBPNG_DIR = libpng-$(LIBPNG_VER) LIBPNG_SOURCE = libpng-$(LIBPNG_VER).tar.xz LIBPNG_SITE = https://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_VER) @@ -211,9 +211,9 @@ LIBPNG_DEPS = zlib LIBPNG_CONF = $(if $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse),--enable-arm-neon,--disable-arm-neon) libpng: $(LIBPNG_DEPS) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBPNG_TMP) + $(REMOVE)/$(LIBPNG_DIR) $(UNTAR)/$(LIBPNG_SOURCE) - $(CHDIR)/$(LIBPNG_TMP); \ + $(CHDIR)/$(LIBPNG_DIR); \ $(call apply_patches, $(LIBPNG_PATCH)); \ $(CONFIGURE) \ --prefix= \ @@ -228,13 +228,13 @@ libpng: $(LIBPNG_DEPS) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR) $(REWRITE_CONFIG) $(HOST_DIR)/bin/libpng16-config $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBPNG_TMP) + $(REMOVE)/$(LIBPNG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- FREETYPE_VER = 2.10.1 -FREETYPE_TMP = freetype-$(FREETYPE_VER) +FREETYPE_DIR = freetype-$(FREETYPE_VER) FREETYPE_SOURCE = freetype-$(FREETYPE_VER).tar.xz FREETYPE_SITE = https://sourceforge.net/projects/freetype/files/freetype2/$(FREETYPE_VER) @@ -248,16 +248,16 @@ FREETYPE_PATCH += freetype2-pkgconf.patch FREETYPE_DEPS = zlib libpng freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FREETYPE_TMP) + $(REMOVE)/$(FREETYPE_DIR) $(UNTAR)/$(FREETYPE_SOURCE) - $(CHDIR)/$(FREETYPE_TMP); \ + $(CHDIR)/$(FREETYPE_DIR); \ $(call apply_patches, $(FREETYPE_PATCH)); \ sed -i '/^FONT_MODULES += \(type1\|cid\|pfr\|type42\|pcf\|bdf\|winfonts\|cff\)/d' modules.cfg - $(CHDIR)/$(FREETYPE_TMP)/builds/unix; \ + $(CHDIR)/$(FREETYPE_DIR)/builds/unix; \ libtoolize --force --copy; \ aclocal -I .; \ autoconf - $(CHDIR)/$(FREETYPE_TMP); \ + $(CHDIR)/$(FREETYPE_DIR); \ $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ @@ -276,14 +276,14 @@ freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) $(REWRITE_CONFIG) $(HOST_DIR)/bin/freetype-config $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(FREETYPE_TMP) \ + $(REMOVE)/$(FREETYPE_DIR) \ $(TARGET_SHARE_DIR)/aclocal $(TOUCH) # ----------------------------------------------------------------------------- LIBJPEG-TURBO_VER = 2.0.5 -LIBJPEG-TURBO_TMP = libjpeg-turbo-$(LIBJPEG-TURBO_VER) +LIBJPEG-TURBO_DIR = libjpeg-turbo-$(LIBJPEG-TURBO_VER) LIBJPEG-TURBO_SOURCE = libjpeg-turbo-$(LIBJPEG-TURBO_VER).tar.gz LIBJPEG-TURBO_SITE = https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG-TURBO_VER) @@ -293,9 +293,9 @@ $(DL_DIR)/$(LIBJPEG-TURBO_SOURCE): LIBJPEG-TURBO_PATCH = libjpeg-turbo-tiff-ojpeg.patch libjpeg-turbo: $(DL_DIR)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBJPEG-TURBO_TMP) + $(REMOVE)/$(LIBJPEG-TURBO_DIR) $(UNTAR)/$(LIBJPEG-TURBO_SOURCE) - $(CHDIR)/$(LIBJPEG-TURBO_TMP); \ + $(CHDIR)/$(LIBJPEG-TURBO_DIR); \ $(call apply_patches, $(LIBJPEG-TURBO_PATCH)); \ $(CMAKE) \ -DWITH_SIMD=False \ @@ -305,13 +305,13 @@ libjpeg-turbo: $(DL_DIR)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) rm -f $(addprefix $(TARGET_BIN_DIR)/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) - $(REMOVE)/$(LIBJPEG-TURBO_TMP) + $(REMOVE)/$(LIBJPEG-TURBO_DIR) $(TOUCH) # ----------------------------------------------------------------------------- OPENSSL_VER = 1.0.2t -OPENSSL_TMP = openssl-$(OPENSSL_VER) +OPENSSL_DIR = openssl-$(OPENSSL_VER) OPENSSL_SOURCE = openssl-$(OPENSSL_VER).tar.gz OPENSSL_SITE = https://www.openssl.org/source @@ -327,9 +327,9 @@ else ifeq ($(BOXARCH), mips) endif openssl: $(DL_DIR)/$(OPENSSL_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(OPENSSL_TMP) + $(REMOVE)/$(OPENSSL_DIR) $(UNTAR)/$(OPENSSL_SOURCE) - $(CHDIR)/$(OPENSSL_TMP); \ + $(CHDIR)/$(OPENSSL_DIR); \ $(call apply_patches, $(addprefix $(@F)/,$(OPENSSL_PATCH))); \ ./Configure \ $(OPENSSL_ARCH) \ @@ -371,13 +371,13 @@ endif ln -sf libcrypto.so.1.0.0 $(TARGET_LIB_DIR)/libcrypto.so.$$version; \ ln -sf libssl.so.1.0.0 $(TARGET_LIB_DIR)/libssl.so.$$version; \ done - $(REMOVE)/$(OPENSSL_TMP) + $(REMOVE)/$(OPENSSL_DIR) $(TOUCH) # ----------------------------------------------------------------------------- NCURSES_VER = 6.1 -NCURSES_TMP = ncurses-$(NCURSES_VER) +NCURSES_DIR = ncurses-$(NCURSES_VER) NCURSES_SOURCE = ncurses-$(NCURSES_VER).tar.gz NCURSES_SITE = https://ftp.gnu.org/pub/gnu/ncurses @@ -387,9 +387,9 @@ $(DL_DIR)/$(NCURSES_SOURCE): NCURSES_PATCH = ncurses-gcc-5.x-MKlib_gen.patch ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NCURSES_TMP) + $(REMOVE)/$(NCURSES_DIR) $(UNTAR)/$(NCURSES_SOURCE) - $(CHDIR)/$(NCURSES_TMP); \ + $(CHDIR)/$(NCURSES_DIR); \ $(call apply_patches, $(NCURSES_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -419,7 +419,7 @@ ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) ln -sf ./ncurses/curses.h $(TARGET_INCLUDE_DIR)/curses.h ln -sf ./ncurses/curses.h $(TARGET_INCLUDE_DIR)/ncurses.h ln -sf ./ncurses/term.h $(TARGET_INCLUDE_DIR)/term.h - $(REMOVE)/$(NCURSES_TMP) + $(REMOVE)/$(NCURSES_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -442,7 +442,7 @@ openthreads: $(SOURCE_DIR)/$(NI-OPENTHREADS) | $(TARGET_DIR) # ----------------------------------------------------------------------------- LIBUSB_VER = 1.0.23 -LIBUSB_TMP = libusb-$(LIBUSB_VER) +LIBUSB_DIR = libusb-$(LIBUSB_VER) LIBUSB_SOURCE = libusb-$(LIBUSB_VER).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VER) @@ -450,9 +450,9 @@ $(DL_DIR)/$(LIBUSB_SOURCE): $(DOWNLOAD) $(LIBUSB_SITE)/$(LIBUSB_SOURCE) libusb: $(DL_DIR)/$(LIBUSB_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBUSB_TMP) + $(REMOVE)/$(LIBUSB_DIR) $(UNTAR)/$(LIBUSB_SOURCE) - $(CHDIR)/$(LIBUSB_TMP); \ + $(CHDIR)/$(LIBUSB_DIR); \ $(CONFIGURE) \ --prefix= \ --disable-udev \ @@ -461,13 +461,13 @@ libusb: $(DL_DIR)/$(LIBUSB_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR); \ $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBUSB_TMP) + $(REMOVE)/$(LIBUSB_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBUSB-COMPAT_VER = 0.1.7 -LIBUSB-COMPAT_TMP = libusb-compat-$(LIBUSB-COMPAT_VER) +LIBUSB-COMPAT_DIR = libusb-compat-$(LIBUSB-COMPAT_VER) LIBUSB-COMPAT_SOURCE = libusb-compat-$(LIBUSB-COMPAT_VER).tar.bz2 LIBUSB-COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB-COMPAT_VER) @@ -479,9 +479,9 @@ LIBUSB-COMPAT_PATCH = 0001-fix-a-build-issue-on-linux.patch LUBUSB-COMPAT_DEPS = libusb libusb-compat: $(LUBUSB-COMPAT_DEPS) $(DL_DIR)/$(LIBUSB-COMPAT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBUSB-COMPAT_TMP) + $(REMOVE)/$(LIBUSB-COMPAT_DIR) $(UNTAR)/$(LIBUSB-COMPAT_SOURCE) - $(CHDIR)/$(LIBUSB-COMPAT_TMP); \ + $(CHDIR)/$(LIBUSB-COMPAT_DIR); \ $(call apply_patches, $(addprefix $(@F)/,$(LIBUSB-COMPAT_PATCH))); \ $(CONFIGURE) \ --prefix= \ @@ -492,13 +492,13 @@ libusb-compat: $(LUBUSB-COMPAT_DEPS) $(DL_DIR)/$(LIBUSB-COMPAT_SOURCE) | $(TARGE $(REWRITE_CONFIG) $(HOST_DIR)/bin/libusb-config $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBUSB-COMPAT_TMP) + $(REMOVE)/$(LIBUSB-COMPAT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBGD_VER = 2.2.5 -LIBGD_TMP = libgd-$(LIBGD_VER) +LIBGD_DIR = libgd-$(LIBGD_VER) LIBGD_SOURCE = libgd-$(LIBGD_VER).tar.xz LIBGD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VER) @@ -508,9 +508,9 @@ $(DL_DIR)/$(LIBGD_SOURCE): LIBGD_DEPS = zlib libpng libjpeg-turbo freetype libgd: $(LIBGD_DEPS) $(DL_DIR)/$(LIBGD_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBGD_TMP) + $(REMOVE)/$(LIBGD_DIR) $(UNTAR)/$(LIBGD_SOURCE) - $(CHDIR)/$(LIBGD_TMP); \ + $(CHDIR)/$(LIBGD_DIR); \ ./bootstrap.sh; \ $(CONFIGURE) \ --prefix= \ @@ -523,13 +523,13 @@ libgd: $(LIBGD_DEPS) $(DL_DIR)/$(LIBGD_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBGD_TMP) + $(REMOVE)/$(LIBGD_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBDPF_VER = git -LIBDPF_TMP = dpf-ax.$(LIBDPF_VER) +LIBDPF_DIR = dpf-ax.$(LIBDPF_VER) LIBDPF_SOURCE = dpf-ax.$(LIBDPF_VER) LIBDPF_SITE = $(GITHUB)/MaxWiesel @@ -538,10 +538,10 @@ LIBDPF_PATCH = libdpf-crossbuild.patch LIBDPF_DEPS = libusb-compat libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(LIBDPF_TMP) + $(REMOVE)/$(LIBDPF_DIR) $(GET-GIT-SOURCE) $(LIBDPF_SITE)/$(LIBDPF_SOURCE) $(DL_DIR)/$(LIBDPF_SOURCE) $(CPDIR)/$(LIBDPF_SOURCE) - $(CHDIR)/$(LIBDPF_TMP)/dpflib; \ + $(CHDIR)/$(LIBDPF_DIR)/dpflib; \ $(call apply_patches, $(LIBDPF_PATCH)); \ make libdpf.a CC=$(TARGET_CC) PREFIX=$(TARGET_DIR); \ mkdir -p $(TARGET_INCLUDE_DIR)/libdpf; \ @@ -549,13 +549,13 @@ libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR) cp ../include/spiflash.h $(TARGET_INCLUDE_DIR)/libdpf/; \ cp ../include/usbuser.h $(TARGET_INCLUDE_DIR)/libdpf/; \ cp libdpf.a $(TARGET_LIB_DIR)/ - $(REMOVE)/$(LIBDPF_TMP) + $(REMOVE)/$(LIBDPF_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LZO_VER = 2.10 -LZO_TMP = lzo-$(LZO_VER) +LZO_DIR = lzo-$(LZO_VER) LZO_SOURCE = lzo-$(LZO_VER).tar.gz LZO_SITE = https://www.oberhumer.com/opensource/lzo/download @@ -563,9 +563,9 @@ $(DL_DIR)/$(LZO_SOURCE): $(DOWNLOAD) $(LZO_SITE)/$(LZO_SOURCE) lzo: $(DL_DIR)/$(LZO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LZO_TMP) + $(REMOVE)/$(LZO_DIR) $(UNTAR)/$(LZO_SOURCE) - $(CHDIR)/$(LZO_TMP); \ + $(CHDIR)/$(LZO_DIR); \ $(CONFIGURE) \ --mandir=$(remove-mandir) \ --docdir=$(remove-docdir) \ @@ -574,13 +574,13 @@ lzo: $(DL_DIR)/$(LZO_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LZO_TMP) + $(REMOVE)/$(LZO_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBSIGC_VER = 2.10.3 -LIBSIGC_TMP = libsigc++-$(LIBSIGC_VER) +LIBSIGC_DIR = libsigc++-$(LIBSIGC_VER) LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VER).tar.xz LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(basename $(LIBSIGC_VER)) @@ -588,9 +588,9 @@ $(DL_DIR)/$(LIBSIGC_SOURCE): $(DOWNLOAD) $(LIBSIGC_SITE)/$(LIBSIGC_SOURCE) libsigc: $(DL_DIR)/$(LIBSIGC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBSIGC_TMP) + $(REMOVE)/$(LIBSIGC_DIR) $(UNTAR)/$(LIBSIGC_SOURCE) - $(CHDIR)/$(LIBSIGC_TMP); \ + $(CHDIR)/$(LIBSIGC_DIR); \ $(CONFIGURE) \ --prefix= \ --disable-documentation \ @@ -602,13 +602,13 @@ libsigc: $(DL_DIR)/$(LIBSIGC_SOURCE) | $(TARGET_DIR) ln -sf ./sigc++-2.0/sigc++ $(TARGET_INCLUDE_DIR)/sigc++ $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBSIGC_TMP) + $(REMOVE)/$(LIBSIGC_DIR) $(TOUCH) # ----------------------------------------------------------------------------- EXPAT_VER = 2.2.9 -EXPAT_TMP = expat-$(EXPAT_VER) +EXPAT_DIR = expat-$(EXPAT_VER) EXPAT_SOURCE = expat-$(EXPAT_VER).tar.bz2 EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VER) @@ -618,9 +618,9 @@ $(DL_DIR)/$(EXPAT_SOURCE): EXPAT_PATCH = expat-libtool-tag.patch expat: $(DL_DIR)/$(EXPAT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(EXPAT_TMP) + $(REMOVE)/$(EXPAT_DIR) $(UNTAR)/$(EXPAT_SOURCE) - $(CHDIR)/$(EXPAT_TMP); \ + $(CHDIR)/$(EXPAT_DIR); \ $(call apply_patches, $(EXPAT_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -635,13 +635,13 @@ expat: $(DL_DIR)/$(EXPAT_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(EXPAT_TMP) + $(REMOVE)/$(EXPAT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBBLURAY_VER = 0.9.3 -LIBBLURAY_TMP = libbluray-$(LIBBLURAY_VER) +LIBBLURAY_DIR = libbluray-$(LIBBLURAY_VER) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VER).tar.bz2 LIBBLURAY_SITE = ftp.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VER) @@ -656,9 +656,9 @@ ifeq ($(BOXSERIES), hd2) endif libbluray: $(LIBBLURAY_DEPS) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBBLURAY_TMP) + $(REMOVE)/$(LIBBLURAY_DIR) $(UNTAR)/$(LIBBLURAY_SOURCE) - $(CHDIR)/$(LIBBLURAY_TMP); \ + $(CHDIR)/$(LIBBLURAY_DIR); \ $(call apply_patches, $(LIBBLURAY_PATCH)); \ ./bootstrap; \ $(CONFIGURE) \ @@ -681,13 +681,13 @@ libbluray: $(LIBBLURAY_DEPS) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBBLURAY_TMP) + $(REMOVE)/$(LIBBLURAY_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBASS_VER = 0.14.0 -LIBASS_TMP = libass-$(LIBASS_VER) +LIBASS_DIR = libass-$(LIBASS_VER) LIBASS_SOURCE = libass-$(LIBASS_VER).tar.xz LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VER) @@ -699,9 +699,9 @@ LIBASS_PATCH = libass.patch LIBASS_DEPS = freetype fribidi libass: $(LIBASS_DEPS) $(DL_DIR)/$(LIBASS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBASS_TMP) + $(REMOVE)/$(LIBASS_DIR) $(UNTAR)/$(LIBASS_SOURCE) - $(CHDIR)/$(LIBASS_TMP); \ + $(CHDIR)/$(LIBASS_DIR); \ $(call apply_patches, $(LIBASS_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -716,13 +716,13 @@ libass: $(LIBASS_DEPS) $(DL_DIR)/$(LIBASS_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBASS_TMP) + $(REMOVE)/$(LIBASS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBGPG-ERROR_VER = 1.37 -LIBGPG-ERROR_TMP = libgpg-error-$(LIBGPG-ERROR_VER) +LIBGPG-ERROR_DIR = libgpg-error-$(LIBGPG-ERROR_VER) LIBGPG-ERROR_SOURCE = libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 LIBGPG-ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error @@ -730,9 +730,9 @@ $(DL_DIR)/$(LIBGPG-ERROR_SOURCE): $(DOWNLOAD) $(LIBGPG-ERROR_SITE)/$(LIBGPG-ERROR_SOURCE) libgpg-error: $(DL_DIR)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBGPG-ERROR_TMP) + $(REMOVE)/$(LIBGPG-ERROR_DIR) $(UNTAR)/$(LIBGPG-ERROR_SOURCE) - $(CHDIR)/$(LIBGPG-ERROR_TMP); \ + $(CHDIR)/$(LIBGPG-ERROR_DIR); \ pushd src/syscfg; \ ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h lock-obj-pub.$(TARGET).h; \ ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h lock-obj-pub.linux-uclibcgnueabi.h; \ @@ -754,13 +754,13 @@ libgpg-error: $(DL_DIR)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) rm -f $(addprefix $(TARGET_BIN_DIR)/,gpg-error gpgrt-config) - $(REMOVE)/$(LIBGPG-ERROR_TMP) + $(REMOVE)/$(LIBGPG-ERROR_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBGCRYPT_VER = 1.8.5 -LIBGCRYPT_TMP = libgcrypt-$(LIBGCRYPT_VER) +LIBGCRYPT_DIR = libgcrypt-$(LIBGCRYPT_VER) LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VER).tar.gz LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt @@ -770,9 +770,9 @@ $(DL_DIR)/$(LIBGCRYPT_SOURCE): LIBGCRYPT_DEPS = libgpg-error libgcrypt: $(LIBGCRYPT_DEPS) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBGCRYPT_TMP) + $(REMOVE)/$(LIBGCRYPT_DIR) $(UNTAR)/$(LIBGCRYPT_SOURCE) - $(CHDIR)/$(LIBGCRYPT_TMP); \ + $(CHDIR)/$(LIBGCRYPT_DIR); \ $(CONFIGURE) \ --prefix= \ --datarootdir=$(remove-datarootdir) \ @@ -790,13 +790,13 @@ libgcrypt: $(LIBGCRYPT_DEPS) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR) rm -rf $(TARGET_BIN_DIR)/dumpsexp rm -rf $(TARGET_BIN_DIR)/hmac256 rm -rf $(TARGET_BIN_DIR)/mpicalc - $(REMOVE)/$(LIBGCRYPT_TMP) + $(REMOVE)/$(LIBGCRYPT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBAACS_VER = 0.9.0 -LIBAACS_TMP = libaacs-$(LIBAACS_VER) +LIBAACS_DIR = libaacs-$(LIBAACS_VER) LIBAACS_SOURCE = libaacs-$(LIBAACS_VER).tar.bz2 LIBAACS_SITE = ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VER) @@ -806,9 +806,9 @@ $(DL_DIR)/$(LIBAACS_SOURCE): LIBAACS_DEPS = libgcrypt libaacs: $(LIBAACS_DEPS) $(DL_DIR)/$(LIBAACS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBAACS_TMP) + $(REMOVE)/$(LIBAACS_DIR) $(UNTAR)/$(LIBAACS_SOURCE) - $(CHDIR)/$(LIBAACS_TMP); \ + $(CHDIR)/$(LIBAACS_DIR); \ ./bootstrap; \ $(CONFIGURE) \ --prefix= \ @@ -824,13 +824,13 @@ libaacs: $(LIBAACS_DEPS) $(DL_DIR)/$(LIBAACS_SOURCE) | $(TARGET_DIR) $(CD) $(TARGET_DIR); \ mkdir -p .config/aacs .cache/aacs/vuk cp $(TARGET_FILES)/libaacs/KEYDB.cfg $(TARGET_DIR)/.config/aacs - $(REMOVE)/$(LIBAACS_TMP) + $(REMOVE)/$(LIBAACS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBBDPLUS_VER = 0.1.2 -LIBBDPLUS_TMP = libbdplus-$(LIBBDPLUS_VER) +LIBBDPLUS_DIR = libbdplus-$(LIBBDPLUS_VER) LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VER).tar.bz2 LIBBDPLUS_SITE = ftp://ftp.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VER) @@ -840,9 +840,9 @@ $(DL_DIR)/$(LIBBDPLUS_SOURCE): LIBBDPLUS_DEPS = libaacs libbdplus: $(LIBBDPLUS_DEPS) $(DL_DIR)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBBDPLUS_TMP) + $(REMOVE)/$(LIBBDPLUS_DIR) $(UNTAR)/$(LIBBDPLUS_SOURCE) - $(CHDIR)/$(LIBBDPLUS_TMP); \ + $(CHDIR)/$(LIBBDPLUS_DIR); \ ./bootstrap; \ $(CONFIGURE) \ --prefix= \ @@ -858,13 +858,13 @@ libbdplus: $(LIBBDPLUS_DEPS) $(DL_DIR)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR) $(CD) $(TARGET_DIR); \ mkdir -p .config/bdplus/vm0 cp -f $(TARGET_FILES)/libbdplus/* $(TARGET_DIR)/.config/bdplus/vm0 - $(REMOVE)/$(LIBBDPLUS_TMP) + $(REMOVE)/$(LIBBDPLUS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBXML2_VER = 2.9.10 -LIBXML2_TMP = libxml2-$(LIBXML2_VER) +LIBXML2_DIR = libxml2-$(LIBXML2_VER) LIBXML2_SOURCE = libxml2-$(LIBXML2_VER).tar.gz LIBXML2_SITE = http://xmlsoft.org/sources @@ -872,9 +872,9 @@ $(DL_DIR)/$(LIBXML2_SOURCE): $(DOWNLOAD) $(LIBXML2_SITE)/$(LIBXML2_SOURCE) libxml2: $(DL_DIR)/$(LIBXML2_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBXML2_TMP) + $(REMOVE)/$(LIBXML2_DIR) $(UNTAR)/$(LIBXML2_SOURCE) - $(CHDIR)/$(LIBXML2_TMP); \ + $(CHDIR)/$(LIBXML2_DIR); \ $(APPLY_PATCHES); \ $(CONFIGURE) \ --prefix= \ @@ -899,13 +899,13 @@ libxml2: $(DL_DIR)/$(LIBXML2_SOURCE) | $(TARGET_DIR) $(REWRITE_PKGCONF_PC) rm -rf $(TARGET_LIB_DIR)/xml2Conf.sh rm -rf $(TARGET_LIB_DIR)/cmake - $(REMOVE)/$(LIBXML2_TMP) + $(REMOVE)/$(LIBXML2_DIR) $(TOUCH) # ----------------------------------------------------------------------------- PUGIXML_VER = 1.10 -PUGIXML_TMP = pugixml-$(PUGIXML_VER) +PUGIXML_DIR = pugixml-$(PUGIXML_VER) PUGIXML_SOURCE = pugixml-$(PUGIXML_VER).tar.gz PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VER) @@ -915,21 +915,21 @@ $(DL_DIR)/$(PUGIXML_SOURCE): PUGIXML_PATCH = pugixml-config.patch pugixml: $(DL_DIR)/$(PUGIXML_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PUGIXML_TMP) + $(REMOVE)/$(PUGIXML_DIR) $(UNTAR)/$(PUGIXML_SOURCE) - $(CHDIR)/$(PUGIXML_TMP); \ + $(CHDIR)/$(PUGIXML_DIR); \ $(call apply_patches, $(PUGIXML_PATCH)); \ $(CMAKE); \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_LIB_DIR)/cmake - $(REMOVE)/$(PUGIXML_TMP) + $(REMOVE)/$(PUGIXML_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBROXML_VER = 3.0.2 -LIBROXML_TMP = libroxml-$(LIBROXML_VER) +LIBROXML_DIR = libroxml-$(LIBROXML_VER) LIBROXML_SOURCE = libroxml-$(LIBROXML_VER).tar.gz LIBROXML_SITE = http://download.libroxml.net/pool/v3.x @@ -937,9 +937,9 @@ $(DL_DIR)/$(LIBROXML_SOURCE): $(DOWNLOAD) $(LIBROXML_SITE)/$(LIBROXML_SOURCE) libroxml: $(DL_DIR)/$(LIBROXML_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBROXML_TMP) + $(REMOVE)/$(LIBROXML_DIR) $(UNTAR)/$(LIBROXML_SOURCE) - $(CHDIR)/$(LIBROXML_TMP); \ + $(CHDIR)/$(LIBROXML_DIR); \ $(CONFIGURE) \ --prefix= \ --disable-roxml \ @@ -948,7 +948,7 @@ libroxml: $(DL_DIR)/$(LIBROXML_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBROXML_TMP) + $(REMOVE)/$(LIBROXML_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -975,7 +975,7 @@ rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI-RTMPDUMP) | $(TARGET_DIR) # ----------------------------------------------------------------------------- LIBTIRPC_VER = 1.2.6 -LIBTIRPC_TMP = libtirpc-$(LIBTIRPC_VER) +LIBTIRPC_DIR = libtirpc-$(LIBTIRPC_VER) LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VER).tar.bz2 LIBTIRPC_SITE = https://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VER) @@ -987,9 +987,9 @@ LIBTIRP_PATCH += 0003-Automatically-generate-XDR-header-files-from-.x-sour.patch LIBTIRP_PATCH += 0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch libtirpc: $(DL_DIR)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBTIRPC_TMP) + $(REMOVE)/$(LIBTIRPC_DIR) $(UNTAR)/$(LIBTIRPC_SOURCE) - $(CHDIR)/$(LIBTIRPC_TMP); \ + $(CHDIR)/$(LIBTIRPC_DIR); \ $(call apply_patches, $(addprefix $(@F)/,$(LIBTIRP_PATCH))); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1003,13 +1003,13 @@ libtirpc: $(DL_DIR)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBTIRPC_TMP) + $(REMOVE)/$(LIBTIRPC_DIR) $(TOUCH) # ----------------------------------------------------------------------------- CONFUSE_VER = 3.2.2 -CONFUSE_TMP = confuse-$(CONFUSE_VER) +CONFUSE_DIR = confuse-$(CONFUSE_VER) CONFUSE_SOURCE = confuse-$(CONFUSE_VER).tar.xz CONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(CONFUSE_VER) @@ -1017,9 +1017,9 @@ $(DL_DIR)/$(CONFUSE_SOURCE): $(DOWNLOAD) $(CONFUSE_SITE)/$(CONFUSE_SOURCE) confuse: $(DL_DIR)/$(CONFUSE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(CONFUSE_TMP) + $(REMOVE)/$(CONFUSE_DIR) $(UNTAR)/$(CONFUSE_SOURCE) - $(CHDIR)/$(CONFUSE_TMP); \ + $(CHDIR)/$(CONFUSE_DIR); \ $(CONFIGURE) \ --prefix= \ --docdir=$(remove-docdir) \ @@ -1031,13 +1031,13 @@ confuse: $(DL_DIR)/$(CONFUSE_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(CONFUSE_TMP) + $(REMOVE)/$(CONFUSE_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBITE_VER = 2.0.2 -LIBITE_TMP = libite-$(LIBITE_VER) +LIBITE_DIR = libite-$(LIBITE_VER) LIBITE_SOURCE = libite-$(LIBITE_VER).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VER) @@ -1045,9 +1045,9 @@ $(DL_DIR)/$(LIBITE_SOURCE): $(DOWNLOAD) $(LIBITE_SITE)/$(LIBITE_SOURCE) libite: $(DL_DIR)/$(LIBITE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBITE_TMP) + $(REMOVE)/$(LIBITE_DIR) $(UNTAR)/$(LIBITE_SOURCE) - $(CHDIR)/$(LIBITE_TMP); \ + $(CHDIR)/$(LIBITE_DIR); \ $(CONFIGURE) \ --prefix= \ --docdir=$(remove-docdir) \ @@ -1059,13 +1059,13 @@ libite: $(DL_DIR)/$(LIBITE_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBITE_TMP) + $(REMOVE)/$(LIBITE_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBMAD_VER = 0.15.1b -LIBMAD_TMP = libmad-$(LIBMAD_VER) +LIBMAD_DIR = libmad-$(LIBMAD_VER) LIBMAD_SOURCE = libmad-$(LIBMAD_VER).tar.gz LIBMAD_SITE = https://sourceforge.net/projects/mad/files/libmad/$(LIBMAD_VER) @@ -1080,9 +1080,9 @@ LIBMAD_PATCH += libmad-thumb2-fixed-arm.patch LIBMAD_PATCH += libmad-thumb2-imdct-arm.patch libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBMAD_TMP) + $(REMOVE)/$(LIBMAD_DIR) $(UNTAR)/$(LIBMAD_SOURCE) - $(CHDIR)/$(LIBMAD_TMP); \ + $(CHDIR)/$(LIBMAD_DIR); \ $(call apply_patches, $(LIBMAD_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1096,13 +1096,13 @@ libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBMAD_TMP) + $(REMOVE)/$(LIBMAD_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBVORBISIDEC_VER = 1.2.1+git20180316 -LIBVORBISIDEC_TMP = libvorbisidec-$(LIBVORBISIDEC_VER) +LIBVORBISIDEC_DIR = libvorbisidec-$(LIBVORBISIDEC_VER) LIBVORBISIDEC_SOURCE = libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz LIBVORBISIDEC_SITE = https://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec @@ -1112,9 +1112,9 @@ $(DL_DIR)/$(LIBVORBISIDEC_SOURCE): LIBVORBISIDEC_DEPS = libogg libvorbisidec: $(LIBVORBISIDEC_DEPS) $(DL_DIR)/$(LIBVORBISIDEC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBVORBISIDEC_TMP) + $(REMOVE)/$(LIBVORBISIDEC_DIR) $(UNTAR)/$(LIBVORBISIDEC_SOURCE) - $(CHDIR)/$(LIBVORBISIDEC_TMP); \ + $(CHDIR)/$(LIBVORBISIDEC_DIR); \ sed -i '122 s/^/#/' configure.in; \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1124,13 +1124,13 @@ libvorbisidec: $(LIBVORBISIDEC_DEPS) $(DL_DIR)/$(LIBVORBISIDEC_SOURCE) | $(TARGE $(MAKE) install DESTDIR=$(TARGET_DIR); \ $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBVORBISIDEC_TMP) + $(REMOVE)/$(LIBVORBISIDEC_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBOGG_VER = 1.3.4 -LIBOGG_TMP = libogg-$(LIBOGG_VER) +LIBOGG_DIR = libogg-$(LIBOGG_VER) LIBOGG_SOURCE = libogg-$(LIBOGG_VER).tar.gz LIBOGG_SITE = https://ftp.osuosl.org/pub/xiph/releases/ogg @@ -1138,9 +1138,9 @@ $(DL_DIR)/$(LIBOGG_SOURCE): $(DOWNLOAD) $(LIBOGG_SITE)/$(LIBOGG_SOURCE) libogg: $(DL_DIR)/$(LIBOGG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBOGG_TMP) + $(REMOVE)/$(LIBOGG_DIR) $(UNTAR)/$(LIBOGG_SOURCE) - $(CHDIR)/$(LIBOGG_TMP); \ + $(CHDIR)/$(LIBOGG_DIR); \ $(CONFIGURE) \ --prefix= \ --datarootdir=$(remove-datarootdir) \ @@ -1150,13 +1150,13 @@ libogg: $(DL_DIR)/$(LIBOGG_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBOGG_TMP) + $(REMOVE)/$(LIBOGG_DIR) $(TOUCH) # ----------------------------------------------------------------------------- FRIBIDI_VER = 1.0.10 -FRIBIDI_TMP = fribidi-$(FRIBIDI_VER) +FRIBIDI_DIR = fribidi-$(FRIBIDI_VER) FRIBIDI_SOURCE = fribidi-$(FRIBIDI_VER).tar.xz FRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VER) @@ -1164,9 +1164,9 @@ $(DL_DIR)/$(FRIBIDI_SOURCE): $(DOWNLOAD) $(FRIBIDI_SITE)/$(FRIBIDI_SOURCE) fribidi: $(DL_DIR)/$(FRIBIDI_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FRIBIDI_TMP) + $(REMOVE)/$(FRIBIDI_DIR) $(UNTAR)/$(FRIBIDI_SOURCE) - $(CHDIR)/$(FRIBIDI_TMP); \ + $(CHDIR)/$(FRIBIDI_DIR); \ $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ @@ -1177,13 +1177,13 @@ fribidi: $(DL_DIR)/$(FRIBIDI_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(FRIBIDI_TMP) + $(REMOVE)/$(FRIBIDI_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBFFI_VER = 3.2.1 -LIBFFI_TMP = libffi-$(LIBFFI_VER) +LIBFFI_DIR = libffi-$(LIBFFI_VER) LIBFFI_SOURCE = libffi-$(LIBFFI_VER).tar.gz LIBFFI_SITE = ftp://sourceware.org/pub/libffi @@ -1195,9 +1195,9 @@ LIBFFI_PATCH = libffi-install_headers.patch LIBFFI_CONF = $(if $(filter $(BOXSERIES), hd1),--enable-static --disable-shared) libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBFFI_TMP) + $(REMOVE)/$(LIBFFI_DIR) $(UNTAR)/$(LIBFFI_SOURCE) - $(CHDIR)/$(LIBFFI_TMP); \ + $(CHDIR)/$(LIBFFI_DIR); \ $(call apply_patches, $(LIBFFI_PATCH)); \ $(CONFIGURE) \ --prefix= \ @@ -1208,13 +1208,13 @@ libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(LIBFFI_TMP) + $(REMOVE)/$(LIBFFI_DIR) $(TOUCH) # ----------------------------------------------------------------------------- GLIB2_VER = 2.56.3 -GLIB2_TMP = glib-$(GLIB2_VER) +GLIB2_DIR = glib-$(GLIB2_VER) GLIB2_SOURCE = glib-$(GLIB2_VER).tar.xz GLIB2_SITE = https://ftp.gnome.org/pub/gnome/sources/glib/$(basename $(GLIB2_VER)) @@ -1237,9 +1237,9 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vusolo4k vuduo4k vuduo4kse vuultimo4k endif glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GLIB2_TMP) + $(REMOVE)/$(GLIB2_DIR) $(UNTAR)/$(GLIB2_SOURCE) - $(CHDIR)/$(GLIB2_TMP); \ + $(CHDIR)/$(GLIB2_DIR); \ $(call apply_patches, $(GLIB2_PATCH)); \ echo "ac_cv_type_long_long=yes" > arm-linux.cache; \ echo "glib_cv_stack_grows=no" >> arm-linux.cache; \ @@ -1268,13 +1268,13 @@ glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) rm -f $(addprefix $(TARGET_BIN_DIR)/,gapplication gdbus* gio* glib* gobject-query gresource gsettings gtester*) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(GLIB2_TMP) + $(REMOVE)/$(GLIB2_DIR) $(TOUCH) # ----------------------------------------------------------------------------- ALSA-LIB_VER = 1.2.3.2 -ALSA-LIB_TMP = alsa-lib-$(ALSA-LIB_VER) +ALSA-LIB_DIR = alsa-lib-$(ALSA-LIB_VER) ALSA-LIB_SOURCE = alsa-lib-$(ALSA-LIB_VER).tar.bz2 ALSA-LIB_SITE = https://www.alsa-project.org/files/pub/lib @@ -1282,9 +1282,9 @@ $(DL_DIR)/$(ALSA-LIB_SOURCE): $(DOWNLOAD) $(ALSA-LIB_SITE)/$(ALSA-LIB_SOURCE) alsa-lib: $(DL_DIR)/$(ALSA-LIB_SOURCE) - $(REMOVE)/$(ALSA-LIB_TMP) + $(REMOVE)/$(ALSA-LIB_DIR) $(UNTAR)/$(ALSA-LIB_SOURCE) - $(CHDIR)/$(ALSA-LIB_TMP); \ + $(CHDIR)/$(ALSA-LIB_DIR); \ $(APPLY_PATCHES); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1309,13 +1309,13 @@ alsa-lib: $(DL_DIR)/$(ALSA-LIB_SOURCE) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(ALSA-LIB_TMP) + $(REMOVE)/$(ALSA-LIB_DIR) $(TOUCH) # ----------------------------------------------------------------------------- POPT_VER = 1.16 -POPT_TMP = popt-$(POPT_VER) +POPT_DIR = popt-$(POPT_VER) POPT_SOURCE = popt-$(POPT_VER).tar.gz POPT_SITE = ftp://anduin.linuxfromscratch.org/BLFS/popt @@ -1323,9 +1323,9 @@ $(DL_DIR)/$(POPT_SOURCE): $(DOWNLOAD) $(POPT_SITE)/$(POPT_SOURCE) popt: $(DL_DIR)/$(POPT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(POPT_TMP) + $(REMOVE)/$(POPT_DIR) $(UNTAR)/$(POPT_SOURCE) - $(CHDIR)/$(POPT_TMP); \ + $(CHDIR)/$(POPT_DIR); \ $(CONFIGURE) \ --prefix= \ --datarootdir=$(remove-datarootdir) \ @@ -1334,13 +1334,13 @@ popt: $(DL_DIR)/$(POPT_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(POPT_TMP) + $(REMOVE)/$(POPT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LIBICONV_VER = 1.15 -LIBICONV_TMP = libiconv-$(LIBICONV_VER) +LIBICONV_DIR = libiconv-$(LIBICONV_VER) LIBICONV_SOURCE = libiconv-$(LIBICONV_VER).tar.gz LIBICONV_SITE = https://ftp.gnu.org/gnu/libiconv @@ -1348,9 +1348,9 @@ $(DL_DIR)/$(LIBICONV_SOURCE): $(DOWNLOAD) $(LIBICONV_SITE)/$(LIBICONV_SOURCE) libiconv: $(DL_DIR)/$(LIBICONV_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LIBICONV_TMP) + $(REMOVE)/$(LIBICONV_DIR) $(UNTAR)/$(LIBICONV_SOURCE) - $(CHDIR)/$(LIBICONV_TMP); \ + $(CHDIR)/$(LIBICONV_DIR); \ sed -i -e '/preload/d' Makefile.in; \ $(CONFIGURE) CPPFLAGS="$(TARGET_CPPFLAGS) -fPIC" \ --target=$(TARGET) \ @@ -1363,13 +1363,13 @@ libiconv: $(DL_DIR)/$(LIBICONV_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(LIBICONV_TMP) + $(REMOVE)/$(LIBICONV_DIR) $(TOUCH) # ----------------------------------------------------------------------------- GRAPHLCD_BASE_VER = git -GRAPHLCD_BASE_TMP = graphlcd-base.$(GRAPHLCD_BASE_VER) +GRAPHLCD_BASE_DIR = graphlcd-base.$(GRAPHLCD_BASE_VER) GRAPHLCD_BASE_SOURCE = graphlcd-base.$(GRAPHLCD_BASE_VER) GRAPHLCD_BASE_SITE = git://projects.vdr-developer.org @@ -1390,15 +1390,15 @@ GRAPHLCD_BASE_MAKE_OPTS = \ DESTDIR=$(TARGET_DIR) graphlcd-base: $(GRAPHLCD_BASE_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(GRAPHLCD_BASE_TMP) + $(REMOVE)/$(GRAPHLCD_BASE_DIR) $(GET-GIT-SOURCE) $(GRAPHLCD_BASE_SITE)/$(GRAPHLCD_BASE_SOURCE) $(DL_DIR)/$(GRAPHLCD_BASE_SOURCE) - $(CPDIR)/$(GRAPHLCD_BASE_TMP) - $(CHDIR)/$(GRAPHLCD_BASE_TMP); \ + $(CPDIR)/$(GRAPHLCD_BASE_DIR) + $(CHDIR)/$(GRAPHLCD_BASE_DIR); \ $(call apply_patches, $(addprefix $(@)/,$(GRAPHLCD_BASE_PATCH))); \ $(MAKE) $(GRAPHLCD_BASE_MAKE_OPTS) -C glcdgraphics all; \ $(MAKE) $(GRAPHLCD_BASE_MAKE_OPTS) -C glcddrivers all; \ $(MAKE) $(GRAPHLCD_BASE_MAKE_OPTS) -C glcdgraphics install; \ $(MAKE) $(GRAPHLCD_BASE_MAKE_OPTS) -C glcddrivers install; \ $(INSTALL_DATA) -D graphlcd.conf $(TARGET_DIR)/etc/graphlcd.conf - $(REMOVE)/$(GRAPHLCD_BASE_TMP) + $(REMOVE)/$(GRAPHLCD_BASE_DIR) $(TOUCH) diff --git a/make/target-lua.mk b/make/target-lua.mk index ea23311d..18c45e04 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -5,7 +5,7 @@ LUA_ABIVER = 5.2 LUA_VER = 5.2.4 -LUA_TMP = lua-$(LUA_VER) +LUA_DIR = lua-$(LUA_VER) LUA_SOURCE = lua-$(LUA_VER).tar.gz LUA_SITE = https://www.lua.org @@ -21,9 +21,9 @@ LUA_PATCH += lua-04-crashfix.diff LUA_DEPS = ncurses lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LUA_TMP) + $(REMOVE)/$(LUA_DIR) $(UNTAR)/$(LUA_SOURCE) - $(CHDIR)/$(LUA_TMP); \ + $(CHDIR)/$(LUA_DIR); \ $(call apply_patches, $(LUA_PATCH)); \ $(MAKE) linux \ PKG_VERSION=$(LUA_VER) \ @@ -35,13 +35,13 @@ lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR) $(MAKE) pc INSTALL_TOP=$(TARGET_DIR) > $(PKG_CONFIG_PATH)/lua.pc $(REWRITE_PKGCONF_PC) rm -rf $(TARGET_DIR)/bin/luac - $(REMOVE)/$(LUA_TMP) + $(REMOVE)/$(LUA_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LUAEXPAT_VER = 1.3.3 -LUAEXPAT_TMP = luaexpat-$(LUAEXPAT_VER) +LUAEXPAT_DIR = luaexpat-$(LUAEXPAT_VER) LUAEXPAT_SOURCE = luaexpat-$(LUAEXPAT_VER).tar.gz LUAEXPAT_SITE = https://github.com/tomasguisasola/luaexpat/archive @@ -51,9 +51,9 @@ $(DL_DIR)/$(LUAEXPAT_SOURCE): LUAEXPAT_DEPS = expat lua luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LUAEXPAT_TMP) + $(REMOVE)/$(LUAEXPAT_DIR) $(UNTAR)/$(LUAEXPAT_SOURCE) - $(CHDIR)/$(LUAEXPAT_TMP); \ + $(CHDIR)/$(LUAEXPAT_DIR); \ sed -i 's|^EXPAT_INC=.*|EXPAT_INC= $(TARGET_INCLUDE_DIR)|' makefile; \ sed -i 's|^CFLAGS =.*|& -L$(TARGET_LIB_DIR)|' makefile; \ sed -i 's|^CC =.*|CC = $(TARGET_CC)|' makefile; \ @@ -64,13 +64,13 @@ luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR) $(MAKE) install \ PREFIX=$(TARGET_DIR) \ LUA_SYS_VER=$(LUA_ABIVER) - $(REMOVE)/$(LUAEXPAT_TMP) + $(REMOVE)/$(LUAEXPAT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LUA-FEEDPARSER_VER = 0.71 -LUA-FEEDPARSER_TMP = lua-feedparser-$(LUA-FEEDPARSER_VER) +LUA-FEEDPARSER_DIR = lua-feedparser-$(LUA-FEEDPARSER_VER) LUA-FEEDPARSER_SOURCE = lua-feedparser-$(LUA-FEEDPARSER_VER).tar.gz LUA-FEEDPARSER_SITE = https://github.com/slact/lua-feedparser/archive @@ -82,13 +82,13 @@ LUA-FEEDPARSER_PATCH = lua-feedparser.patch LUA-DEEDPARSER_DEPS = luaexpat lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LUA-FEEDPARSER_TMP) + $(REMOVE)/$(LUA-FEEDPARSER_DIR) $(UNTAR)/$(LUA-FEEDPARSER_SOURCE) - $(CHDIR)/$(LUA-FEEDPARSER_TMP); \ + $(CHDIR)/$(LUA-FEEDPARSER_DIR); \ sed -i 's|^PREFIX =|PREFIX ?=|' Makefile; \ $(call apply_patches, $(LUA-FEEDPARSER_PATCH)); \ $(MAKE) install PREFIX=$(TARGET_DIR) - $(REMOVE)/$(LUA-FEEDPARSER_TMP) + $(REMOVE)/$(LUA-FEEDPARSER_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -109,17 +109,17 @@ luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- LUACURL_VER = git -LUACURL_TMP = lua-curlv3.$(LUACURL_VER) +LUACURL_DIR = lua-curlv3.$(LUACURL_VER) LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER) LUACURL_SITE = https://github.com/lua-curl/$(LUACURL_SOURCE) LUACURL_DEPS = libcurl lua luacurl: $(LUACURL_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(LUACURL_TMP) + $(REMOVE)/$(LUACURL_DIR) $(GET-GIT-SOURCE) $(LUACURL_SITE) $(DL_DIR)/$(LUACURL_SOURCE) $(CPDIR)/$(LUACURL_SOURCE) - $(CHDIR)/$(LUACURL_TMP); \ + $(CHDIR)/$(LUACURL_DIR); \ $(MAKE_ENV) \ $(MAKE) \ LIBDIR=$(TARGET_LIB_DIR) \ @@ -127,13 +127,13 @@ luacurl: $(LUACURL_DEPS) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) \ LUA_CMOD=/lib/lua/$(LUA_ABIVER) \ LUA_LMOD=/share/lua/$(LUA_ABIVER) - $(REMOVE)/$(LUACURL_TMP) + $(REMOVE)/$(LUACURL_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LUAPOSIX_VER = 31 -LUAPOSIX_TMP = luaposix-$(LUAPOSIX_VER) +LUAPOSIX_DIR = luaposix-$(LUAPOSIX_VER) LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VER).tar.gz LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive @@ -160,9 +160,9 @@ $(DL_DIR)/$(SLINGSHOT_SOURCE): $(DOWNLOAD) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VER).tar.gz -O $(@) luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOURCE) $(DL_DIR)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LUAPOSIX_TMP) + $(REMOVE)/$(LUAPOSIX_DIR) $(UNTAR)/$(LUAPOSIX_SOURCE) - $(CHDIR)/$(LUAPOSIX_TMP); \ + $(CHDIR)/$(LUAPOSIX_DIR); \ tar -C gnulib --strip=1 -xf $(DL_DIR)/$(GNULIB_SOURCE); \ tar -C slingshot --strip=1 -xf $(DL_DIR)/$(SLINGSHOT_SOURCE); \ $(call apply_patches, $(LUAPOSIX_PATCH)); \ @@ -180,5 +180,5 @@ luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOUR ; \ $(MAKE); \ $(MAKE) all check install - $(REMOVE)/$(LUAPOSIX_TMP) + $(REMOVE)/$(LUAPOSIX_DIR) $(TOUCH) diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index e2ef17b6..1c4e35f0 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -5,7 +5,7 @@ # usbutils-008 needs udev USBUTILS_VER = 007 -USBUTILS_TMP = usbutils-$(USBUTILS_VER) +USBUTILS_DIR = usbutils-$(USBUTILS_VER) USBUTILS_SOURCE = usbutils-$(USBUTILS_VER).tar.xz USBUTILS_SITE = https://www.kernel.org/pub/linux/utils/usb/usbutils @@ -18,9 +18,9 @@ USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch USBUTILS_DEPS = libusb-compat usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(USBUTILS_TMP) + $(REMOVE)/$(USBUTILS_DIR) $(UNTAR)/$(USBUTILS_SOURCE) - $(CHDIR)/$(USBUTILS_TMP); \ + $(CHDIR)/$(USBUTILS_DIR); \ $(call apply_patches, $(USBUTILS_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -35,13 +35,13 @@ usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) rm -rf $(TARGET_DIR)/sbin/update-usbids.sh rm -rf $(TARGET_SHARE_DIR)/pkgconfig rm -rf $(TARGET_SHARE_DIR)/usb.ids.gz - $(REMOVE)/$(USBUTILS_TMP) + $(REMOVE)/$(USBUTILS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- BINUTILS_VER = 2.35 -BINUTILS_TMP = binutils-$(BINUTILS_VER) +BINUTILS_DIR = binutils-$(BINUTILS_VER) BINUTILS_SOURCE = binutils-$(BINUTILS_VER).tar.bz2 BINUTILS_SITE = https://ftp.gnu.org/gnu/binutils @@ -51,9 +51,9 @@ $(DL_DIR)/$(BINUTILS_SOURCE): BINUTILS_BIN = objdump objcopy binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BINUTILS_TMP) + $(REMOVE)/$(BINUTILS_DIR) $(UNTAR)/$(BINUTILS_SOURCE) - $(CHDIR)/$(BINUTILS_TMP); \ + $(CHDIR)/$(BINUTILS_DIR); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -66,15 +66,15 @@ binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ for bin in $(BINUTILS_BIN); do \ - $(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_TMP)/binutils/$$bin $(TARGET_DIR)/bin/; \ + $(INSTALL_EXEC) $(BUILD_DIR)/$(BINUTILS_DIR)/binutils/$$bin $(TARGET_DIR)/bin/; \ done - $(REMOVE)/$(BINUTILS_TMP) + $(REMOVE)/$(BINUTILS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- UTIL-LINUX_VER = 2.36 -UTIL-LINUX_TMP = util-linux-$(UTIL-LINUX_VER) +UTIL-LINUX_DIR = util-linux-$(UTIL-LINUX_VER) UTIL-LINUX_SOURCE = util-linux-$(UTIL-LINUX_VER).tar.xz UTIL-LINUX_SITE = https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL-LINUX_VER) @@ -84,9 +84,9 @@ $(DL_DIR)/$(UTIL-LINUX_SOURCE): UTUL-LINUX_DEPS = ncurses zlib util-linux: $(UTUL-LINUX_DEPS) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(UTIL-LINUX_TMP) + $(REMOVE)/$(UTIL-LINUX_DIR) $(UNTAR)/$(UTIL-LINUX_SOURCE) - $(CHDIR)/$(UTIL-LINUX_TMP); \ + $(CHDIR)/$(UTIL-LINUX_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -117,13 +117,13 @@ util-linux: $(UTUL-LINUX_DEPS) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(UTIL-LINUX_TMP) + $(REMOVE)/$(UTIL-LINUX_DIR) $(TOUCH) # ----------------------------------------------------------------------------- ASTRA-SM_VER = git -ASTRA-SM_TMP = astra-sm.$(ASTRA-SM_VER) +ASTRA-SM_DIR = astra-sm.$(ASTRA-SM_VER) ASTRA-SM_SOURCE = astra-sm.$(ASTRA-SM_VER) ASTRA-SM_SITE = https://gitlab.com/crazycat69 @@ -132,23 +132,23 @@ ASTRA-SM_DEPS = openssl # workaround unrecognized command line options astra-sm: TARGET_ABI="" astra-sm: $(ASTRA-SM_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(ASTRA-SM_TMP) + $(REMOVE)/$(ASTRA-SM_DIR) $(GET-GIT-SOURCE) $(ASTRA-SM_SITE)/$(ASTRA-SM_SOURCE) $(DL_DIR)/$(ASTRA-SM_SOURCE) $(CPDIR)/$(ASTRA-SM_SOURCE) - $(CHDIR)/$(ASTRA-SM_TMP); \ + $(CHDIR)/$(ASTRA-SM_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --without-lua \ ; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(ASTRA-SM_TMP) + $(REMOVE)/$(ASTRA-SM_DIR) $(TOUCH) # ----------------------------------------------------------------------------- IOZONE_VER = 3_490 -IOZONE_TMP = iozone$(IOZONE_VER) +IOZONE_DIR = iozone$(IOZONE_VER) IOZONE_SOURCE = iozone$(IOZONE_VER).tar IOZONE_SITE = http://www.iozone.org/src/current @@ -156,21 +156,21 @@ $(DL_DIR)/$(IOZONE_SOURCE): $(DOWNLOAD) $(IOZONE_SITE)/$(IOZONE_SOURCE) iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(IOZONE_TMP) + $(REMOVE)/$(IOZONE_DIR) $(UNTAR)/$(IOZONE_SOURCE) - $(CHDIR)/$(IOZONE_TMP)/src/current; \ + $(CHDIR)/$(IOZONE_DIR)/src/current; \ sed -i -e "s/= gcc/= $(TARGET_CC)/" makefile; \ sed -i -e "s/= cc/= $(TARGET_CC)/" makefile; \ $(MAKE_ENV) \ $(MAKE) linux-arm; \ $(INSTALL_EXEC) iozone $(TARGET_BIN_DIR)/ - $(REMOVE)/$(IOZONE_TMP) + $(REMOVE)/$(IOZONE_DIR) $(TOUCH) # ----------------------------------------------------------------------------- READLINE_VER = 8.0 -READLINE_TMP = readline-$(READLINE_VER) +READLINE_DIR = readline-$(READLINE_VER) READLINE_SOURCE = readline-$(READLINE_VER).tar.gz READLINE_SITE = https://ftp.gnu.org/gnu/readline @@ -178,9 +178,9 @@ $(DL_DIR)/$(READLINE_SOURCE): $(DOWNLOAD) $(READLINE_SITE)/$(READLINE_SOURCE) readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(READLINE_TMP) + $(REMOVE)/$(READLINE_DIR) $(UNTAR)/$(READLINE_SOURCE) - $(CHDIR)/$(READLINE_TMP); \ + $(CHDIR)/$(READLINE_DIR); \ $(CONFIGURE) \ --prefix= \ --datarootdir=$(remove-datarootdir) \ @@ -188,5 +188,5 @@ readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR) $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(READLINE_TMP) + $(REMOVE)/$(READLINE_DIR) $(TOUCH) diff --git a/make/target-tools.mk b/make/target-tools.mk index 327ac9de..28f21e2b 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -4,7 +4,7 @@ # ----------------------------------------------------------------------------- BUSYBOX_VER = 1.31.1 -BUSYBOX_TMP = busybox-$(BUSYBOX_VER) +BUSYBOX_DIR = busybox-$(BUSYBOX_VER) BUSYBOX_SOURCE = busybox-$(BUSYBOX_VER).tar.bz2 BUSYBOX_SITE = https://busybox.net/downloads @@ -38,7 +38,7 @@ BUSYBOX_MAKE_OPTS = \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ CONFIG_PREFIX="$(TARGET_DIR)" -BUSYBOX_BUILD_CONFIG = $(BUILD_DIR)/$(BUSYBOX_TMP)/.config +BUSYBOX_BUILD_CONFIG = $(BUILD_DIR)/$(BUSYBOX_DIR)/.config define BUSYBOX_INSTALL_CONFIG $(INSTALL_DATA) $(CONFIGS)/busybox-minimal.config $(BUSYBOX_BUILD_CONFIG) @@ -110,23 +110,23 @@ define BUSYBOX_ADD_TO_SHELLS endef busybox: $(BUSYBOX_DEPS) $(DL_DIR)/$(BUSYBOX_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BUSYBOX_TMP) + $(REMOVE)/$(BUSYBOX_DIR) $(UNTAR)/$(BUSYBOX_SOURCE) - $(CHDIR)/$(BUSYBOX_TMP); \ + $(CHDIR)/$(BUSYBOX_DIR); \ $(call apply_patches, $(BUSYBOX_PATCH)) $(BUSYBOX_INSTALL_CONFIG) $(BUSYBOX_MODIFY_CONFIG) - $(CHDIR)/$(BUSYBOX_TMP); \ + $(CHDIR)/$(BUSYBOX_DIR); \ $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) busybox; \ $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) install-noclobber $(BUSYBOX_ADD_TO_SHELLS) - $(REMOVE)/$(BUSYBOX_TMP) + $(REMOVE)/$(BUSYBOX_DIR) $(TOUCH) # ----------------------------------------------------------------------------- OPENVPN_VER = 2.4.9 -OPENVPN_TMP = openvpn-$(OPENVPN_VER) +OPENVPN_DIR = openvpn-$(OPENVPN_VER) OPENVPN_SOURCE = openvpn-$(OPENVPN_VER).tar.xz OPENVPN_SITE = http://build.openvpn.net/downloads/releases @@ -136,9 +136,9 @@ $(DL_DIR)/$(OPENVPN_SOURCE): OPENVPN_DEPS = lzo openssl openvpn: $(OPENVPN_DEPS) $(DL_DIR)/$(OPENVPN_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(OPENVPN_TMP) + $(REMOVE)/$(OPENVPN_DIR) $(UNTAR)/$(OPENVPN_SOURCE) - $(CHDIR)/$(OPENVPN_TMP); \ + $(CHDIR)/$(OPENVPN_DIR); \ $(CONFIGURE) \ IFCONFIG="/sbin/ifconfig" \ NETSTAT="/bin/netstat" \ @@ -159,13 +159,13 @@ openvpn: $(OPENVPN_DEPS) $(DL_DIR)/$(OPENVPN_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(OPENVPN_TMP) + $(REMOVE)/$(OPENVPN_DIR) $(TOUCH) # ----------------------------------------------------------------------------- OPENSSH_VER = 8.3p1 -OPENSSH_TMP = openssh-$(OPENSSH_VER) +OPENSSH_DIR = openssh-$(OPENSSH_VER) OPENSSH_SOURCE = openssh-$(OPENSSH_VER).tar.gz OPENSSH_SITE = https://artfiles.org/openbsd/OpenSSH/portable @@ -175,9 +175,9 @@ $(DL_DIR)/$(OPENSSH_SOURCE): OPENSSH_DEPS = openssl zlib openssh: $(OPENSSH_DEPS) $(DL_DIR)/$(OPENSSH_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(OPENSSH_TMP) + $(REMOVE)/$(OPENSSH_DIR) $(UNTAR)/$(OPENSSH_SOURCE) - $(CHDIR)/$(OPENSSH_TMP); \ + $(CHDIR)/$(OPENSSH_DIR); \ export ac_cv_search_dlopen=no; \ ./configure \ $(CONFIGURE_OPTS) \ @@ -201,13 +201,13 @@ openssh: $(OPENSSH_DEPS) $(DL_DIR)/$(OPENSSH_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(OPENSSH_TMP) + $(REMOVE)/$(OPENSSH_DIR) $(TOUCH) # ----------------------------------------------------------------------------- TZDATA_VER = 2019b -TZDATA_TMP = tzdata$(TZDATA_VER) +TZDATA_DIR = tzdata$(TZDATA_VER) TZDATA_SOURCE = tzdata$(TZDATA_VER).tar.gz TZDATA_SITE = ftp://ftp.iana.org/tz/releases @@ -223,9 +223,9 @@ TZDATA_ZONELIST = \ ETC_LOCALTIME = $(if $(filter $(PERSISTENT_VAR_PARTITION), yes),/var/etc/localtime,/etc/localtime) tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(TZDATA_TMP) - $(MKDIR)/$(TZDATA_TMP) - $(CHDIR)/$(TZDATA_TMP); \ + $(REMOVE)/$(TZDATA_DIR) + $(MKDIR)/$(TZDATA_DIR) + $(CHDIR)/$(TZDATA_DIR); \ tar -xf $(DL_DIR)/$(TZDATA_SOURCE); \ unset ${!LC_*}; LANG=POSIX; LC_ALL=POSIX; export LANG LC_ALL; \ $(HOST_ZIC) -d zoneinfo.tmp $(TZDATA_ZONELIST); \ @@ -243,13 +243,13 @@ tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR) mv zoneinfo/ $(TARGET_SHARE_DIR)/ $(INSTALL_DATA) -D $(TARGET_FILES)/tzdata/timezone.xml $(TARGET_DIR)/etc/timezone.xml $(INSTALL_DATA) $(TARGET_SHARE_DIR)/zoneinfo/CET $(TARGET_DIR)$(ETC_LOCALTIME) - $(REMOVE)/$(TZDATA_TMP) + $(REMOVE)/$(TZDATA_DIR) $(TOUCH) # ----------------------------------------------------------------------------- MTD-UTILS_VER = 2.0.2 -MTD-UTILS_TMP = mtd-utils-$(MTD-UTILS_VER) +MTD-UTILS_DIR = mtd-utils-$(MTD-UTILS_VER) MTD-UTILS_SOURCE = mtd-utils-$(MTD-UTILS_VER).tar.bz2 MTD-UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils @@ -259,9 +259,9 @@ $(DL_DIR)/$(MTD-UTILS_SOURCE): MTD-UTILS_DEPS = zlib lzo e2fsprogs mtd-utils: $(MTD-UTILS_DEPS) $(DL_DIR)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(MTD-UTILS_TMP) + $(REMOVE)/$(MTD-UTILS_DIR) $(UNTAR)/$(MTD-UTILS_SOURCE) - $(CHDIR)/$(MTD-UTILS_TMP); \ + $(CHDIR)/$(MTD-UTILS_DIR); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -272,20 +272,20 @@ mtd-utils: $(MTD-UTILS_DEPS) $(DL_DIR)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) ifeq ($(BOXSERIES), hd2) - $(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 + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nanddump $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nandtest $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/nandwrite $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/mtd_debug $(TARGET_DIR)/sbin + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/mkfs.jffs2 $(TARGET_DIR)/sbin endif - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_TMP)/flash_erase $(TARGET_DIR)/sbin - $(REMOVE)/$(MTD-UTILS_TMP) + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(MTD-UTILS_DIR)/flash_erase $(TARGET_DIR)/sbin + $(REMOVE)/$(MTD-UTILS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- IPERF_VER = 3.1.3 -IPERF_TMP = iperf-$(IPERF_VER) +IPERF_DIR = iperf-$(IPERF_VER) IPERF_SOURCE = iperf-$(IPERF_VER)-source.tar.gz IPERF_SITE = https://iperf.fr/download/source @@ -295,9 +295,9 @@ $(DL_DIR)/$(IPERF_SOURCE): IPERF_PATCH = iperf-disable-profiling.patch iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(IPERF_TMP) + $(REMOVE)/$(IPERF_DIR) $(UNTAR)/$(IPERF_SOURCE) - $(CHDIR)/$(IPERF_TMP); \ + $(CHDIR)/$(IPERF_DIR); \ $(call apply_patches, $(IPERF_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -306,13 +306,13 @@ iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(IPERF_TMP) + $(REMOVE)/$(IPERF_DIR) $(TOUCH) # ----------------------------------------------------------------------------- PARTED_VER = 3.2 -PARTED_TMP = parted-$(PARTED_VER) +PARTED_DIR = parted-$(PARTED_VER) PARTED_SOURCE = parted-$(PARTED_VER).tar.xz PARTED_SITE = https://ftp.gnu.org/gnu/parted @@ -326,9 +326,9 @@ PARTED_PATCH += parted-iconv.patch PARTED_DEPS = e2fsprogs parted: $(PARTED_DEPS) $(DL_DIR)/$(PARTED_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PARTED_TMP) + $(REMOVE)/$(PARTED_DIR) $(UNTAR)/$(PARTED_SOURCE) - $(CHDIR)/$(PARTED_TMP); \ + $(CHDIR)/$(PARTED_DIR); \ $(call apply_patches, $(PARTED_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -349,13 +349,13 @@ parted: $(PARTED_DEPS) $(DL_DIR)/$(PARTED_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(PARTED_TMP) + $(REMOVE)/$(PARTED_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HDPARM_VER = 9.58 -HDPARM_TMP = hdparm-$(HDPARM_VER) +HDPARM_DIR = hdparm-$(HDPARM_VER) HDPARM_SOURCE = hdparm-$(HDPARM_VER).tar.gz HDPARM_SITE = https://sourceforge.net/projects/hdparm/files/hdparm @@ -363,19 +363,19 @@ $(DL_DIR)/$(HDPARM_SOURCE): $(DOWNLOAD) $(HDPARM_SITE)/$(HDPARM_SOURCE) hdparm: $(DL_DIR)/$(HDPARM_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(HDPARM_TMP) + $(REMOVE)/$(HDPARM_DIR) $(UNTAR)/$(HDPARM_SOURCE) - $(CHDIR)/$(HDPARM_TMP); \ + $(CHDIR)/$(HDPARM_DIR); \ $(MAKE_ENV) \ $(MAKE); \ $(INSTALL_EXEC) -D hdparm $(TARGET_DIR)/sbin/hdparm - $(REMOVE)/$(HDPARM_TMP) + $(REMOVE)/$(HDPARM_DIR) $(TOUCH) # ----------------------------------------------------------------------------- HD-IDLE_VER = 1.05 -HD-IDLE_TMP = hd-idle +HD-IDLE_DIR = hd-idle HD-IDLE_SOURCE = hd-idle-$(HD-IDLE_VER).tgz HD-IDLE_SITE = https://sourceforge.net/projects/hd-idle/files @@ -383,19 +383,19 @@ $(DL_DIR)/$(HD-IDLE_SOURCE): $(DOWNLOAD) $(HD-IDLE_SITE)/$(HD-IDLE_SOURCE) hd-idle: $(DL_DIR)/$(HD-IDLE_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(HD-IDLE_TMP) + $(REMOVE)/$(HD-IDLE_DIR) $(UNTAR)/$(HD-IDLE_SOURCE) - $(CHDIR)/$(HD-IDLE_TMP); \ + $(CHDIR)/$(HD-IDLE_DIR); \ $(MAKE_ENV) \ $(MAKE); \ $(INSTALL_EXEC) -D hd-idle $(TARGET_DIR)/sbin/hd-idle - $(REMOVE)/$(HD-IDLE_TMP) + $(REMOVE)/$(HD-IDLE_DIR) $(TOUCH) # ----------------------------------------------------------------------------- COREUTILS_VER = 8.30 -COREUTILS_TMP = coreutils-$(COREUTILS_VER) +COREUTILS_DIR = coreutils-$(COREUTILS_VER) COREUTILS_SOURCE = coreutils-$(COREUTILS_VER).tar.xz COREUTILS_SITE = https://ftp.gnu.org/gnu/coreutils @@ -407,9 +407,9 @@ COREUTILS_PATCH = coreutils-fix-build.patch COREUTILS_BIN = touch coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(COREUTILS_TMP) + $(REMOVE)/$(COREUTILS_DIR) $(UNTAR)/$(COREUTILS_SOURCE) - $(CHDIR)/$(COREUTILS_TMP); \ + $(CHDIR)/$(COREUTILS_DIR); \ $(call apply_patches, $(COREUTILS_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -431,14 +431,14 @@ coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR) rm -f $(TARGET_DIR)/bin/$$bin; \ $(INSTALL_EXEC) $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_DIR)/bin/$$bin; \ done - $(REMOVE)/$(COREUTILS_TMP) \ + $(REMOVE)/$(COREUTILS_DIR) \ $(TARGET_DIR)/bin.$(@F) $(TOUCH) # ----------------------------------------------------------------------------- LESS_VER = 530 -LESS_TMP = less-$(LESS_VER) +LESS_DIR = less-$(LESS_VER) LESS_SOURCE = less-$(LESS_VER).tar.gz LESS_SITE = http://www.greenwoodsoftware.com/less @@ -448,9 +448,9 @@ $(DL_DIR)/$(LESS_SOURCE): LESS_DEPS = ncurses less: $(LESS_DEPS) $(DL_DIR)/$(LESS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(LESS_TMP) + $(REMOVE)/$(LESS_DIR) $(UNTAR)/$(LESS_SOURCE) - $(CHDIR)/$(LESS_TMP); \ + $(CHDIR)/$(LESS_DIR); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ @@ -458,13 +458,13 @@ less: $(LESS_DEPS) $(DL_DIR)/$(LESS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(LESS_TMP) + $(REMOVE)/$(LESS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- NTP_VER = 4.2.8p15 -NTP_TMP = ntp-$(NTP_VER) +NTP_DIR = ntp-$(NTP_VER) NTP_SOURCE = ntp-$(NTP_VER).tar.gz NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(basename $(NTP_VER)) @@ -474,9 +474,9 @@ $(DL_DIR)/$(NTP_SOURCE): NTP_DEPS = openssl ntp: $(NTP_DEPS) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NTP_TMP) + $(REMOVE)/$(NTP_DIR) $(UNTAR)/$(NTP_SOURCE) - $(CHDIR)/$(NTP_TMP); \ + $(CHDIR)/$(NTP_DIR); \ $(APPLY_PATCHES); \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -490,13 +490,13 @@ ntp: $(NTP_DEPS) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(INSTALL_EXEC) -D ntpdate/ntpdate $(TARGET_DIR)/sbin/ntpdate $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ntpdate.init $(TARGET_DIR)/etc/init.d/ntpdate - $(REMOVE)/$(NTP_TMP) + $(REMOVE)/$(NTP_DIR) $(TOUCH) # ----------------------------------------------------------------------------- DJMOUNT_VER = 0.71 -DJMOUNT_TMP = djmount-$(DJMOUNT_VER) +DJMOUNT_DIR = djmount-$(DJMOUNT_VER) DJMOUNT_SOURCE = djmount-$(DJMOUNT_VER).tar.gz DJMOUNT_SITE = https://sourceforge.net/projects/djmount/files/djmount/$(DJMOUNT_VER) @@ -515,9 +515,9 @@ DJMOUNT_PATCH += djmount-support-seeking-in-large-2gb-files.patch DJMOUNT_DEPS = libfuse djmount: $(DJMOUNT_DEPS) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(DJMOUNT_TMP) + $(REMOVE)/$(DJMOUNT_DIR) $(UNTAR)/$(DJMOUNT_SOURCE) - $(CHDIR)/$(DJMOUNT_TMP); \ + $(CHDIR)/$(DJMOUNT_DIR); \ $(call apply_patches, $(DJMOUNT_PATCH)); \ touch libupnp/config.aux/config.rpath; \ autoreconf -fi; \ @@ -529,13 +529,13 @@ djmount: $(DJMOUNT_DEPS) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) make install DESTDIR=$(TARGET_DIR) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount $(UPDATE-RC.D) djmount defaults 75 25 - $(REMOVE)/$(DJMOUNT_TMP) + $(REMOVE)/$(DJMOUNT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- USHARE_VER = 1.1a -USHARE_TMP = ushare-uShare_v$(USHARE_VER) +USHARE_DIR = ushare-uShare_v$(USHARE_VER) USHARE_SOURCE = uShare_v$(USHARE_VER).tar.gz USHARE_SITE = https://github.com/GeeXboX/ushare/archive @@ -549,9 +549,9 @@ USHARE_PATCH += ushare-disable-iconv-check.patch USHARE_DEPS = libupnp ushare: $(USHARE_DEPS) $(DL_DIR)/$(USHARE_SOURCE)| $(TARGET_DIR) - $(REMOVE)/$(USHARE_TMP) + $(REMOVE)/$(USHARE_DIR) $(UNTAR)/$(USHARE_SOURCE) - $(CHDIR)/$(USHARE_TMP); \ + $(CHDIR)/$(USHARE_DIR); \ $(call apply_patches, $(USHARE_PATCH)); \ $(MAKE_ENV) \ ./configure \ @@ -570,13 +570,13 @@ ushare: $(USHARE_DEPS) $(DL_DIR)/$(USHARE_SOURCE)| $(TARGET_DIR) sed -i 's|%(BOXTYPE)|$(BOXTYPE)|; s|%(BOXMODEL)|$(BOXMODEL)|' $(TARGET_DIR)/etc/ushare.conf $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ushare.init $(TARGET_DIR)/etc/init.d/ushare $(UPDATE-RC.D) ushare defaults 75 25 - $(REMOVE)/$(USHARE_TMP) + $(REMOVE)/$(USHARE_DIR) $(TOUCH) # ----------------------------------------------------------------------------- SMARTMONTOOLS_VER = 7.1 -SMARTMONTOOLS_TMP = smartmontools-$(SMARTMONTOOLS_VER) +SMARTMONTOOLS_DIR = smartmontools-$(SMARTMONTOOLS_VER) SMARTMONTOOLS_SOURCE = smartmontools-$(SMARTMONTOOLS_VER).tar.gz SMARTMONTOOLS_SITE = https://sourceforge.net/projects/smartmontools/files/smartmontools/$(SMARTMONTOOLS_VER) @@ -584,22 +584,22 @@ $(DL_DIR)/$(SMARTMONTOOLS_SOURCE): $(DOWNLOAD) $(SMARTMONTOOLS_SITE)/$(SMARTMONTOOLS_SOURCE) smartmontools: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SMARTMONTOOLS_TMP) + $(REMOVE)/$(SMARTMONTOOLS_DIR) $(UNTAR)/$(SMARTMONTOOLS_SOURCE) - $(CHDIR)/$(SMARTMONTOOLS_TMP); \ + $(CHDIR)/$(SMARTMONTOOLS_DIR); \ $(CONFIGURE) \ --target=$(TARGET) \ --prefix= \ ; \ $(MAKE); \ $(INSTALL_EXEC) -D smartctl $(TARGET_DIR)/sbin/smartctl - $(REMOVE)/$(SMARTMONTOOLS_TMP) + $(REMOVE)/$(SMARTMONTOOLS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- INADYN_VER = 2.6 -INADYN_TMP = inadyn-$(INADYN_VER) +INADYN_DIR = inadyn-$(INADYN_VER) INADYN_SOURCE = inadyn-$(INADYN_VER).tar.xz INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VER) @@ -609,9 +609,9 @@ $(DL_DIR)/$(INADYN_SOURCE): INADYN_DEPS = openssl confuse libite inadyn: $(INADYN_DEPS) $(DL_DIR)/$(INADYN_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(INADYN_TMP) + $(REMOVE)/$(INADYN_DIR) $(UNTAR)/$(INADYN_SOURCE) - $(CHDIR)/$(INADYN_TMP); \ + $(CHDIR)/$(INADYN_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -627,13 +627,13 @@ inadyn: $(INADYN_DEPS) $(DL_DIR)/$(INADYN_SOURCE) | $(TARGET_DIR) ln -sf /var/etc/inadyn.conf $(TARGET_DIR)/etc/inadyn.conf $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/inadyn.init $(TARGET_DIR)/etc/init.d/inadyn $(UPDATE-RC.D) inadyn defaults 75 25 - $(REMOVE)/$(INADYN_TMP) + $(REMOVE)/$(INADYN_DIR) $(TOUCH) # ----------------------------------------------------------------------------- VSFTPD_VER = 3.0.3 -VSFTPD_TMP = vsftpd-$(VSFTPD_VER) +VSFTPD_DIR = vsftpd-$(VSFTPD_VER) VSFTPD_SOURCE = vsftpd-$(VSFTPD_VER).tar.gz VSFTPD_SITE = https://security.appspot.com/downloads @@ -648,9 +648,9 @@ VSFTPD_PATCH += vsftpd-login-blank-password.patch VSFTPD_DEPS = openssl vsftpd: $(VSFTPD_DEPS) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(VSFTPD_TMP) + $(REMOVE)/$(VSFTPD_DIR) $(UNTAR)/$(VSFTPD_SOURCE) - $(CHDIR)/$(VSFTPD_TMP); \ + $(CHDIR)/$(VSFTPD_DIR); \ $(call apply_patches, $(VSFTPD_PATCH)); \ sed -i -e 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h; \ sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \ @@ -662,13 +662,13 @@ vsftpd: $(VSFTPD_DEPS) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR) $(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.chroot_list $(TARGET_DIR)/etc/vsftpd.chroot_list $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vsftpd.init $(TARGET_DIR)/etc/init.d/vsftpd $(UPDATE-RC.D) vsftpd defaults 75 25 - $(REMOVE)/$(VSFTPD_TMP) + $(REMOVE)/$(VSFTPD_DIR) $(TOUCH) # ----------------------------------------------------------------------------- PROCPS-NG_VER = 3.3.16 -PROCPS-NG_TMP = procps-ng-$(PROCPS-NG_VER) +PROCPS-NG_DIR = procps-ng-$(PROCPS-NG_VER) PROCPS-NG_SOURCE = procps-ng-$(PROCPS-NG_VER).tar.xz PROCPS-NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production @@ -682,9 +682,9 @@ PROCPS-NG_DEPS = ncurses PROCPS-NG_BIN = ps top procps-ng: $(PROCPS-NG_DEPS) $(DL_DIR)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(PROCPS-NG_TMP) + $(REMOVE)/$(PROCPS-NG_DIR) $(UNTAR)/$(PROCPS-NG_SOURCE) - $(CHDIR)/$(PROCPS-NG_TMP); \ + $(CHDIR)/$(PROCPS-NG_DIR); \ $(call apply_patches, $(PROCPS-NG_PATCH)); \ export ac_cv_func_malloc_0_nonnull=yes; \ export ac_cv_func_realloc_0_nonnull=yes; \ @@ -705,7 +705,7 @@ procps-ng: $(PROCPS-NG_DEPS) $(DL_DIR)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) done $(REWRITE_LIBTOOL_LA) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(PROCPS-NG_TMP) \ + $(REMOVE)/$(PROCPS-NG_DIR) \ $(TARGET_DIR)/bin.$(@F) \ $(TARGET_DIR)/sbin.$(@F) $(TOUCH) @@ -713,7 +713,7 @@ procps-ng: $(PROCPS-NG_DEPS) $(DL_DIR)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- NANO_VER = 4.7 -NANO_TMP = nano-$(NANO_VER) +NANO_DIR = nano-$(NANO_VER) NANO_SOURCE = nano-$(NANO_VER).tar.gz NANO_SITE = https://www.nano-editor.org/dist/v$(basename $(NANO_VER)) @@ -723,9 +723,9 @@ $(DL_DIR)/$(NANO_SOURCE): NANO_DEPS = ncurses nano: $(NANO_DEPS) $(DL_DIR)/$(NANO_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NANO_TMP) + $(REMOVE)/$(NANO_DIR) $(UNTAR)/$(NANO_SOURCE) - $(CHDIR)/$(NANO_TMP); \ + $(CHDIR)/$(NANO_DIR); \ export ac_cv_prog_NCURSESW_CONFIG=false; \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -736,13 +736,13 @@ nano: $(NANO_DEPS) $(DL_DIR)/$(NANO_SOURCE) | $(TARGET_DIR) ; \ $(MAKE) CURSES_LIB="-lncurses"; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(NANO_TMP) + $(REMOVE)/$(NANO_DIR) $(TOUCH) # ----------------------------------------------------------------------------- MINICOM_VER = 2.7.1 -MINICOM_TMP = minicom-$(MINICOM_VER) +MINICOM_DIR = minicom-$(MINICOM_VER) MINICOM_SOURCE = minicom-$(MINICOM_VER).tar.gz MINICOM_SITE = http://fossies.org/linux/misc @@ -754,9 +754,9 @@ MINICOM_PATCH = minicom-fix-h-v-return-value-is-not-0.patch MINICOM_DEPS = ncurses minicom: $(MINICOM_DEPS) $(DL_DIR)/$(MINICOM_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(MINICOM_TMP) + $(REMOVE)/$(MINICOM_DIR) $(UNTAR)/$(MINICOM_SOURCE) - $(CHDIR)/$(MINICOM_TMP); \ + $(CHDIR)/$(MINICOM_DIR); \ $(call apply_patches, $(MINICOM_PATCH)); \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -765,13 +765,13 @@ minicom: $(MINICOM_DEPS) $(DL_DIR)/$(MINICOM_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(INSTALL_EXEC) src/minicom $(TARGET_DIR)/bin - $(REMOVE)/$(MINICOM_TMP) + $(REMOVE)/$(MINICOM_DIR) $(TOUCH) # ----------------------------------------------------------------------------- BASH_VER = 5.0 -BASH_TMP = bash-$(BASH_VER) +BASH_DIR = bash-$(BASH_VER) BASH_SOURCE = bash-$(BASH_VER).tar.gz BASH_SITE = http://ftp.gnu.org/gnu/bash @@ -786,9 +786,9 @@ define BASH_ADD_TO_SHELLS endef bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(BASH_TMP) + $(REMOVE)/$(BASH_DIR) $(UNTAR)/$(BASH_SOURCE) - $(CHDIR)/$(BASH_TMP); \ + $(CHDIR)/$(BASH_DIR); \ $(call apply_patches, $(BASH_PATCH), 0); \ $(CONFIGURE) \ --prefix= \ @@ -799,7 +799,7 @@ bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR) $(REWRITE_PKGCONF_PC) -rm $(addprefix $(TARGET_LIB_DIR)/bash/, loadables.h Makefile.inc) $(BASH_ADD_TO_SHELLS) - $(REMOVE)/$(BASH_TMP) + $(REMOVE)/$(BASH_DIR) $(TOUCH) @@ -807,7 +807,7 @@ bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR) # for coolstream: formatting ext4 failes with newer versions then 1.43.8 E2FSPROGS_VER = $(if $(filter $(BOXTYPE), coolstream),1.43.8,1.45.6) -E2FSPROGS_TMP = e2fsprogs-$(E2FSPROGS_VER) +E2FSPROGS_DIR = e2fsprogs-$(E2FSPROGS_VER) E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VER).tar.gz E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VER) @@ -815,9 +815,9 @@ $(DL_DIR)/$(E2FSPROGS_SOURCE): $(DOWNLOAD) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE) e2fsprogs: $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(E2FSPROGS_TMP) + $(REMOVE)/$(E2FSPROGS_DIR) $(UNTAR)/$(E2FSPROGS_SOURCE) - $(CHDIR)/$(E2FSPROGS_TMP); \ + $(CHDIR)/$(E2FSPROGS_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -853,13 +853,13 @@ e2fsprogs: $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR) -rm $(addprefix $(TARGET_DIR)/bin/, chattr compile_et lsattr mk_cmds uuidgen) -rm $(addprefix $(TARGET_DIR)/sbin/, dumpe2fs e2freefrag e2mmpstatus e2undo e4crypt filefrag logsave) $(REWRITE_PKGCONF_PC) - $(REMOVE)/$(E2FSPROGS_TMP) + $(REMOVE)/$(E2FSPROGS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- NTFS-3G_VER = 2017.3.23 -NTFS-3G_TMP = ntfs-3g_ntfsprogs-$(NTFS-3G_VER) +NTFS-3G_DIR = ntfs-3g_ntfsprogs-$(NTFS-3G_VER) NTFS-3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS-3G_VER).tgz NTFS-3G_SITE = https://tuxera.com/opensource @@ -867,9 +867,9 @@ $(DL_DIR)/$(NTFS-3G_SOURCE): $(DOWNLOAD) $(NTFS-3G_SITE)/$(NTFS-3G_SOURCE) ntfs-3g: $(DL_DIR)/$(NTFS-3G_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NTFS-3G_TMP) + $(REMOVE)/$(NTFS-3G_DIR) $(UNTAR)/$(NTFS-3G_SOURCE) - $(CHDIR)/$(NTFS-3G_TMP); \ + $(CHDIR)/$(NTFS-3G_DIR); \ $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ @@ -883,13 +883,13 @@ ntfs-3g: $(DL_DIR)/$(NTFS-3G_SOURCE) | $(TARGET_DIR) -rm $(addprefix $(TARGET_DIR)/bin/,lowntfs-3g ntfs-3g.probe) -rm $(addprefix $(TARGET_DIR)/sbin/,mount.lowntfs-3g) ln -sf /bin/ntfs-3g $(TARGET_DIR)/sbin/mount.ntfs - $(REMOVE)/$(NTFS-3G_TMP) + $(REMOVE)/$(NTFS-3G_DIR) $(TOUCH) # ----------------------------------------------------------------------------- AUTOFS_VER = 5.1.6 -AUTOFS_TMP = autofs-$(AUTOFS_VER) +AUTOFS_DIR = autofs-$(AUTOFS_VER) AUTOFS_SOURCE = autofs-$(AUTOFS_VER).tar.xz AUTOFS_SITE = https://www.kernel.org/pub/linux/daemons/autofs/v5 @@ -906,9 +906,9 @@ AUTOFS_PATCH = force-STRIP-to-emtpy.patch AUTOFS_DEPS = libtirpc autofs: $(AUTOFS_DEPS) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(AUTOFS_TMP) + $(REMOVE)/$(AUTOFS_DIR) $(UNTAR)/$(AUTOFS_SOURCE) - $(CHDIR)/$(AUTOFS_TMP); \ + $(CHDIR)/$(AUTOFS_DIR); \ $(call apply_patches, $(addprefix $(@F)/,$(AUTOFS_PATCH))); \ sed -i "s|nfs/nfs.h|linux/nfs.h|" include/rpc_subs.h; \ export ac_cv_linux_procfs=yes; \ @@ -935,7 +935,7 @@ autofs: $(AUTOFS_DEPS) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) $(MAKE) SUBDIRS="lib daemon modules" install DESTDIR=$(TARGET_DIR) $(INSTALL_COPY) $(TARGET_FILES)/autofs/* $(TARGET_DIR)/ $(UPDATE-RC.D) autofs defaults 75 25 - $(REMOVE)/$(AUTOFS_TMP) + $(REMOVE)/$(AUTOFS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -948,7 +948,7 @@ samba: $(SAMBA_TARGET) # ----------------------------------------------------------------------------- SAMBA33_VER = 3.3.16 -SAMBA33_TMP = samba-$(SAMBA33_VER) +SAMBA33_DIR = samba-$(SAMBA33_VER) SAMBA33_SOURCE = samba-$(SAMBA33_VER).tar.gz SAMBA33_SITE = https://download.samba.org/pub/samba @@ -961,11 +961,11 @@ SAMBA33_PATCH += samba33-configure.in-make-getgrouplist_ok-test-cross-compile.pa SAMBA33_DEPS = zlib samba33: $(SAMBA33_DEPS) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SAMBA33_TMP) + $(REMOVE)/$(SAMBA33_DIR) $(UNTAR)/$(SAMBA33_SOURCE) - $(CHDIR)/$(SAMBA33_TMP); \ + $(CHDIR)/$(SAMBA33_DIR); \ $(call apply_patches, $(SAMBA33_PATCH)); \ - $(CHDIR)/$(SAMBA33_TMP)/source; \ + $(CHDIR)/$(SAMBA33_DIR)/source; \ ./autogen.sh; \ export CONFIG_SITE=$(CONFIGS)/samba33-config.site; \ $(CONFIGURE) \ @@ -1015,13 +1015,13 @@ samba33: $(SAMBA33_DEPS) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) rm -rf $(TARGET_DIR)/bin/smbtar rm -rf $(TARGET_DIR)/bin/smbclient rm -rf $(TARGET_DIR)/bin/smbpasswd - $(REMOVE)/$(SAMBA33_TMP) + $(REMOVE)/$(SAMBA33_DIR) $(TOUCH) # ----------------------------------------------------------------------------- SAMBA36_VER = 3.6.25 -SAMBA36_TMP = samba-$(SAMBA36_VER) +SAMBA36_DIR = samba-$(SAMBA36_VER) SAMBA36_SOURCE = samba-$(SAMBA36_VER).tar.gz SAMBA36_SITE = https://download.samba.org/pub/samba/stable @@ -1043,12 +1043,12 @@ SAMBA36_PATCH0 += samba36-CVE-2017-7494-v3-6.patch SAMBA36_DEPS = zlib samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SAMBA36_TMP) + $(REMOVE)/$(SAMBA36_DIR) $(UNTAR)/$(SAMBA36_SOURCE) - $(CHDIR)/$(SAMBA36_TMP); \ + $(CHDIR)/$(SAMBA36_DIR); \ $(call apply_patches, $(SAMBA36_PATCH1), 1); \ $(call apply_patches, $(SAMBA36_PATCH0), 0); \ - $(CHDIR)/$(SAMBA36_TMP)/source3; \ + $(CHDIR)/$(SAMBA36_DIR)/source3; \ ./autogen.sh; \ export CONFIG_SITE=$(CONFIGS)/samba36-config.site; \ $(CONFIGURE) \ @@ -1096,13 +1096,13 @@ samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) rm -rf $(TARGET_DIR)/bin/smbtar rm -rf $(TARGET_DIR)/bin/smbclient rm -rf $(TARGET_DIR)/bin/smbpasswd - $(REMOVE)/$(SAMBA36_TMP) + $(REMOVE)/$(SAMBA36_DIR) $(TOUCH) # ----------------------------------------------------------------------------- DROPBEAR_VER = 2019.78 -DROPBEAR_TMP = dropbear-$(DROPBEAR_VER) +DROPBEAR_DIR = dropbear-$(DROPBEAR_VER) DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VER).tar.bz2 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases @@ -1112,9 +1112,9 @@ $(DL_DIR)/$(DROPBEAR_SOURCE): DROPBEAR_DEPS = zlib dropbear: $(DROPBEAR_DEPS) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(DROPBEAR_TMP) + $(REMOVE)/$(DROPBEAR_DIR) $(UNTAR)/$(DROPBEAR_SOURCE) - $(CHDIR)/$(DROPBEAR_TMP); \ + $(CHDIR)/$(DROPBEAR_DIR); \ $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ @@ -1142,13 +1142,13 @@ dropbear: $(DROPBEAR_DEPS) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) mkdir -p $(TARGET_DIR)/etc/dropbear $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear $(UPDATE-RC.D) dropbear defaults 75 25 - $(REMOVE)/$(DROPBEAR_TMP) + $(REMOVE)/$(DROPBEAR_DIR) $(TOUCH) # ----------------------------------------------------------------------------- SG3_UTILS_VER = 1.45 -SG3_UTILS_TMP = sg3_utils-$(SG3_UTILS_VER) +SG3_UTILS_DIR = sg3_utils-$(SG3_UTILS_VER) SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VER).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p @@ -1158,9 +1158,9 @@ $(DL_DIR)/$(SG3_UTILS_SOURCE): SG3_UTILS_BIN = sg_start sg3_utils: $(DL_DIR)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SG3_UTILS_TMP) + $(REMOVE)/$(SG3_UTILS_DIR) $(UNTAR)/$(SG3_UTILS_SOURCE) - $(CHDIR)/$(SG3_UTILS_TMP); \ + $(CHDIR)/$(SG3_UTILS_DIR); \ $(CONFIGURE) \ --prefix= \ --bindir=/bin.$(@F) \ @@ -1175,14 +1175,14 @@ sg3_utils: $(DL_DIR)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR) $(REWRITE_LIBTOOL_LA) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sdX.init $(TARGET_DIR)/etc/init.d/sdX $(UPDATE-RC.D) sdX stop 97 0 6 . - $(REMOVE)/$(SG3_UTILS_TMP) \ + $(REMOVE)/$(SG3_UTILS_DIR) \ $(TARGET_DIR)/bin.$(@F) $(TOUCH) # ----------------------------------------------------------------------------- FBSHOT_VER = 0.3 -FBSHOT_TMP = fbshot-$(FBSHOT_VER) +FBSHOT_DIR = fbshot-$(FBSHOT_VER) FBSHOT_SOURCE = fbshot-$(FBSHOT_VER).tar.gz FBSHOT_SITE = http://distro.ibiblio.org/amigolinux/download/Utils/fbshot @@ -1195,31 +1195,31 @@ FBSHOT_PATCH += fbshot_cs_hd2.diff FBSHOT_DEPS = libpng fbshot: $(FBSHOT_DEPS) $(DL_DIR)/$(FBSHOT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FBSHOT_TMP) + $(REMOVE)/$(FBSHOT_DIR) $(UNTAR)/$(FBSHOT_SOURCE) - $(CHDIR)/$(FBSHOT_TMP); \ + $(CHDIR)/$(FBSHOT_DIR); \ $(call apply_patches, $(FBSHOT_PATCH)); \ sed -i 's| gcc | $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) |' Makefile; \ sed -i '/strip fbshot/d' Makefile; \ $(MAKE) all; \ $(INSTALL_EXEC) -D fbshot $(TARGET_DIR)/bin/fbshot - $(REMOVE)/$(FBSHOT_TMP) + $(REMOVE)/$(FBSHOT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- LCD4LINUX_VER = git -LCD4LINUX_TMP = lcd4linux.$(LCD4LINUX_VER) +LCD4LINUX_DIR = lcd4linux.$(LCD4LINUX_VER) LCD4LINUX_SOURCE = lcd4linux.$(LCD4LINUX_VER) LCD4LINUX_SITE = https://github.com/TangoCash LCD4LINUX_DEPS = ncurses libgd libdpf lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(LCD4LINUX_TMP) + $(REMOVE)/$(LCD4LINUX_DIR) $(GET-GIT-SOURCE) $(LCD4LINUX_SITE)/$(LCD4LINUX_SOURCE) $(DL_DIR)/$(LCD4LINUX_SOURCE) $(CPDIR)/$(LCD4LINUX_SOURCE) - $(CHDIR)/$(LCD4LINUX_TMP); \ + $(CHDIR)/$(LCD4LINUX_DIR); \ ./bootstrap; \ $(CONFIGURE) \ --libdir=$(TARGET_LIB_DIR) \ @@ -1238,30 +1238,30 @@ lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR) $(MAKE) install $(INSTALL_COPY) $(TARGET_FILES)/lcd4linux/* $(TARGET_DIR)/ #$(MAKE) samsunglcd4linux - $(REMOVE)/$(LCD4LINUX_TMP) + $(REMOVE)/$(LCD4LINUX_DIR) $(TOUCH) # ----------------------------------------------------------------------------- SAMSUNGLCD4LINUX_VER = git -SAMSUNGLCD4LINUX_TMP = samsunglcd4linux.$(LCD4LINUX_VER) +SAMSUNGLCD4LINUX_DIR = samsunglcd4linux.$(LCD4LINUX_VER) SAMSUNGLCD4LINUX_SOURCE = samsunglcd4linux.$(LCD4LINUX_VER) SAMSUNGLCD4LINUX_SITE = https://github.com/horsti58 samsunglcd4linux: | $(TARGET_DIR) - $(REMOVE)/$(SAMSUNGLCD4LINUX_TMP) + $(REMOVE)/$(SAMSUNGLCD4LINUX_DIR) $(GET-GIT-SOURCE) $(SAMSUNGLCD4LINUX_SITE)/$(SAMSUNGLCD4LINUX_SOURCE) $(DL_DIR)/$(SAMSUNGLCD4LINUX_SOURCE) $(CPDIR)/$(SAMSUNGLCD4LINUX_SOURCE) - $(CHDIR)/$(SAMSUNGLCD4LINUX_TMP)/ni; \ + $(CHDIR)/$(SAMSUNGLCD4LINUX_DIR)/ni; \ $(INSTALL) -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \ $(INSTALL_COPY) share/* $(TARGET_SHARE_DIR) - $(REMOVE)/$(SAMSUNGLCD4LINUX_TMP) + $(REMOVE)/$(SAMSUNGLCD4LINUX_DIR) $(TOUCH) # ----------------------------------------------------------------------------- WPA_SUPPLICANT_VER = 0.7.3 -WPA_SUPPLICANT_TMP = wpa_supplicant-$(WPA_SUPPLICANT_VER) +WPA_SUPPLICANT_DIR = wpa_supplicant-$(WPA_SUPPLICANT_VER) WPA_SUPPLICANT_SOURCE = wpa_supplicant-$(WPA_SUPPLICANT_VER).tar.gz WPA_SUPPLICANT_SITE = https://w1.fi/releases @@ -1271,22 +1271,22 @@ $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE): WPA_SUPPLICANT_DEPS = openssl wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(WPA_SUPPLICANT_TMP) + $(REMOVE)/$(WPA_SUPPLICANT_DIR) $(UNTAR)/$(WPA_SUPPLICANT_SOURCE) - $(CHDIR)/$(WPA_SUPPLICANT_TMP)/wpa_supplicant; \ + $(CHDIR)/$(WPA_SUPPLICANT_DIR)/wpa_supplicant; \ $(INSTALL_DATA) $(CONFIGS)/wpa_supplicant.config .config; \ $(MAKE_ENV) \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=/sbin $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/pre-wlan0.sh $(TARGET_DIR)/etc/network/pre-wlan0.sh $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/post-wlan0.sh $(TARGET_DIR)/etc/network/post-wlan0.sh - $(REMOVE)/$(WPA_SUPPLICANT_TMP) + $(REMOVE)/$(WPA_SUPPLICANT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- XUPNPD_VER = git -XUPNPD_TMP = xupnpd.$(XUPNPD_VER) +XUPNPD_DIR = xupnpd.$(XUPNPD_VER) XUPNPD_SOURCE = xupnpd.$(XUPNPD_VER) XUPNPD_SITE = https://github.com/clark15b @@ -1299,13 +1299,13 @@ XUPNPD_PATCH += xupnpd-add-configuration-files.diff XUPNPD_DEPS = lua openssl xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(XUPNPD_TMP) + $(REMOVE)/$(XUPNPD_DIR) $(GET-GIT-SOURCE) $(XUPNPD_SITE)/$(XUPNPD_SOURCE) $(DL_DIR)/$(XUPNPD_SOURCE) $(CPDIR)/$(XUPNPD_SOURCE) - $(CHDIR)/$(XUPNPD_TMP); \ + $(CHDIR)/$(XUPNPD_DIR); \ git checkout 25d6d44; \ $(call apply_patches, $(XUPNPD_PATCH)) - $(CHDIR)/$(XUPNPD_TMP)/src; \ + $(CHDIR)/$(XUPNPD_DIR)/src; \ $(MAKE_ENV) \ $(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET_CC) STRIP=$(TARGET_STRIP) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)"; \ $(INSTALL_EXEC) -D xupnpd $(TARGET_BIN_DIR)/; \ @@ -1320,13 +1320,13 @@ xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR) $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd $(UPDATE-RC.D) xupnpd defaults 75 25 $(INSTALL_COPY) $(TARGET_FILES)/xupnpd/* $(TARGET_DIR)/ - $(REMOVE)/$(XUPNPD_TMP) + $(REMOVE)/$(XUPNPD_DIR) $(TOUCH) # ----------------------------------------------------------------------------- DOSFSTOOLS_VER = 4.1 -DOSFSTOOLS_TMP = dosfstools-$(DOSFSTOOLS_VER) +DOSFSTOOLS_DIR = dosfstools-$(DOSFSTOOLS_VER) DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VER).tar.xz DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VER) @@ -1338,9 +1338,9 @@ DOSFSTOOLS_PATCH = switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fomit-frame-pointer dosfstools: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(DOSFSTOOLS_TMP) + $(REMOVE)/$(DOSFSTOOLS_DIR) $(UNTAR)/$(DOSFSTOOLS_SOURCE) - $(CHDIR)/$(DOSFSTOOLS_TMP); \ + $(CHDIR)/$(DOSFSTOOLS_DIR); \ $(call apply_patches, $(addprefix $(@F)/,$(DOSFSTOOLS_PATCH))); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1353,13 +1353,13 @@ dosfstools: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(DOSFSTOOLS_TMP) + $(REMOVE)/$(DOSFSTOOLS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- NFS-UTILS_VER = 2.2.1 -NFS-UTILS_TMP = nfs-utils-$(NFS-UTILS_VER) +NFS-UTILS_DIR = nfs-utils-$(NFS-UTILS_VER) NFS-UTILS_SOURCE = nfs-utils-$(NFS-UTILS_VER).tar.bz2 NFS-UTILS_SITE = https://sourceforge.net/projects/nfs/files/nfs-utils/$(NFS-UTILS_VER) @@ -1377,9 +1377,9 @@ NFS-UTILS_DEPS = rpcbind NFS-UTILS_CONF = $(if $(filter $(BOXSERIES), hd1),--disable-ipv6,--enable-ipv6) nfs-utils: $(NFS-UTILS_DEPS) $(DL_DIR)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(NFS-UTILS_TMP) + $(REMOVE)/$(NFS-UTILS_DIR) $(UNTAR)/$(NFS-UTILS_SOURCE) - $(CHDIR)/$(NFS-UTILS_TMP); \ + $(CHDIR)/$(NFS-UTILS_DIR); \ $(call apply_patches, $(NFS-UTILS_PATCH)); \ export knfsd_cv_bsd_signals=no; \ autoreconf -fi; \ @@ -1412,13 +1412,13 @@ nfs-utils: $(NFS-UTILS_DEPS) $(DL_DIR)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) rm -rf $(TARGET_DIR)/sbin/rpcdebug $(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/nfsd.init $(TARGET_DIR)/etc/init.d/nfsd $(UPDATE-RC.D) nfsd defaults 75 25 - $(REMOVE)/$(NFS-UTILS_TMP) + $(REMOVE)/$(NFS-UTILS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- RPCBIND_VER = 1.2.5 -RPCBIND_TMP = rpcbind-$(RPCBIND_VER) +RPCBIND_DIR = rpcbind-$(RPCBIND_VER) RPCBIND_SOURCE = rpcbind-$(RPCBIND_VER).tar.bz2 RPCBIND_SITE = https://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VER) @@ -1431,9 +1431,9 @@ RPCBIND_PATCH += rpcbind-0002-add_option_to_fix_port_number.patch RPCBIND_DEPS = libtirpc rpcbind: $(RPCBIND_DEPS) $(DL_DIR)/$(RPCBIND_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(RPCBIND_TMP) + $(REMOVE)/$(RPCBIND_DIR) $(UNTAR)/$(RPCBIND_SOURCE) - $(CHDIR)/$(RPCBIND_TMP); \ + $(CHDIR)/$(RPCBIND_DIR); \ $(call apply_patches, $(RPCBIND_PATCH)); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1450,13 +1450,13 @@ ifeq ($(BOXSERIES), hd1) sed -i -e '/^\(udp\|tcp\)6/ d' $(TARGET_DIR)/etc/netconfig endif rm -rf $(TARGET_DIR)/bin/rpcgen - $(REMOVE)/$(RPCBIND_TMP) + $(REMOVE)/$(RPCBIND_DIR) $(TOUCH) # ----------------------------------------------------------------------------- FUSE-EXFAT_VER = 1.3.0 -FUSE-EXFAT_TMP = fuse-exfat-$(FUSE-EXFAT_VER) +FUSE-EXFAT_DIR = fuse-exfat-$(FUSE-EXFAT_VER) FUSE-EXFAT_SOURCE = fuse-exfat-$(FUSE-EXFAT_VER).tar.gz FUSE-EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(FUSE-EXFAT_VER) @@ -1466,9 +1466,9 @@ $(DL_DIR)/$(FUSE-EXFAT_SOURCE): FUSE-EXFAT_DEPS = libfuse fuse-exfat: $(FUSE-EXFAT_DEPS) $(DL_DIR)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(FUSE-EXFAT_TMP) + $(REMOVE)/$(FUSE-EXFAT_DIR) $(UNTAR)/$(FUSE-EXFAT_SOURCE) - $(CHDIR)/$(FUSE-EXFAT_TMP); \ + $(CHDIR)/$(FUSE-EXFAT_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -1477,13 +1477,13 @@ fuse-exfat: $(FUSE-EXFAT_DEPS) $(DL_DIR)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(FUSE-EXFAT_TMP) + $(REMOVE)/$(FUSE-EXFAT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- EXFAT-UTILS_VER = 1.3.0 -EXFAT-UTILS_TMP = exfat-utils-$(EXFAT-UTILS_VER) +EXFAT-UTILS_DIR = exfat-utils-$(EXFAT-UTILS_VER) EXFAT-UTILS_SOURCE = exfat-utils-$(EXFAT-UTILS_VER).tar.gz EXFAT-UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT-UTILS_VER) @@ -1493,9 +1493,9 @@ $(DL_DIR)/$(EXFAT-UTILS_SOURCE): EXFAT-UTILS_DEPS = fuse-exfat exfat-utils: $(EXFAT-UTILS_DEPS) $(DL_DIR)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(EXFAT-UTILS_TMP) + $(REMOVE)/$(EXFAT-UTILS_DIR) $(UNTAR)/$(EXFAT-UTILS_SOURCE) - $(CHDIR)/$(EXFAT-UTILS_TMP); \ + $(CHDIR)/$(EXFAT-UTILS_DIR); \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -1504,7 +1504,7 @@ exfat-utils: $(EXFAT-UTILS_DEPS) $(DL_DIR)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(EXFAT-UTILS_TMP) + $(REMOVE)/$(EXFAT-UTILS_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1532,7 +1532,7 @@ streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR) # ----------------------------------------------------------------------------- GETTEXT_VER = 0.19.8.1 -GETTEXT_TMP = gettext-$(GETTEXT_VER) +GETTEXT_DIR = gettext-$(GETTEXT_VER) GETTEXT_SOURCE = gettext-$(GETTEXT_VER).tar.xz GETTEXT_SITE = ftp://ftp.gnu.org/gnu/gettext @@ -1540,9 +1540,9 @@ $(DL_DIR)/$(GETTEXT_SOURCE): $(DOWNLOAD) $(GETTEXT_SITE)/$(GETTEXT_SOURCE) gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GETTEXT_TMP) + $(REMOVE)/$(GETTEXT_DIR) $(UNTAR)/$(GETTEXT_SOURCE) - $(CHDIR)/$(GETTEXT_TMP)/gettext-runtime; \ + $(CHDIR)/$(GETTEXT_DIR)/gettext-runtime; \ autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ @@ -1560,13 +1560,13 @@ gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR) $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) $(REWRITE_LIBTOOL_LA) - $(REMOVE)/$(GETTEXT_TMP) + $(REMOVE)/$(GETTEXT_DIR) $(TOUCH) # ----------------------------------------------------------------------------- MC_VER = 4.8.25 -MC_TMP = mc-$(MC_VER) +MC_DIR = mc-$(MC_VER) MC_SOURCE = mc-$(MC_VER).tar.xz MC_SITE = ftp.midnight-commander.org @@ -1576,9 +1576,9 @@ $(DL_DIR)/$(MC_SOURCE): MC_DEPS = glib2 ncurses mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(MC_TMP) + $(REMOVE)/$(MC_DIR) $(UNTAR)/$(MC_SOURCE) - $(CHDIR)/$(MC_TMP); \ + $(CHDIR)/$(MC_DIR); \ $(APPLY_PATCHES); \ autoreconf -fi; \ $(CONFIGURE) \ @@ -1602,13 +1602,13 @@ mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR) rm -rf $(TARGET_SHARE_DIR)/mc/examples find $(TARGET_SHARE_DIR)/mc/skins -type f ! -name default.ini | xargs --no-run-if-empty rm - $(REMOVE)/$(MC_TMP) + $(REMOVE)/$(MC_DIR) $(TOUCH) # ----------------------------------------------------------------------------- WGET_VER = 1.20.3 -WGET_TMP = wget-$(WGET_VER) +WGET_DIR = wget-$(WGET_VER) WGET_SOURCE = wget-$(WGET_VER).tar.gz WGET_SITE = https://ftp.gnu.org/gnu/wget @@ -1623,9 +1623,9 @@ WGET_DEPS = openssl WGET_CFLAGS = $(TARGET_CFLAGS) -DOPENSSL_NO_ENGINE wget: $(WGET_DEPS) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(WGET_TMP) + $(REMOVE)/$(WGET_DIR) $(UNTAR)/$(WGET_SOURCE) - $(CHDIR)/$(WGET_TMP); \ + $(CHDIR)/$(WGET_DIR); \ $(call apply_patches, $(addprefix $(@F)/,$(WGET_PATCH))); \ $(CONFIGURE) \ --target=$(TARGET) \ @@ -1639,7 +1639,7 @@ wget: $(WGET_DEPS) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(WGET_TMP) + $(REMOVE)/$(WGET_DIR) $(TOUCH) # ----------------------------------------------------------------------------- @@ -1659,17 +1659,17 @@ ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- AIO-GRAB_VER = git -AIO-GRAB_TMP = aio-grab.$(AIO-GRAB_VER) +AIO-GRAB_DIR = aio-grab.$(AIO-GRAB_VER) AIO-GRAB_SOURCE = aio-grab.$(AIO-GRAB_VER) AIO-GRAB_SITE = https://github.com/oe-alliance AIO-GRAB_DEPS = zlib libpng libjpeg-turbo aio-grab: $(AIO-GRAB_DEPS) | $(TARGET_DIR) - $(REMOVE)/$(AIO-GRAB_TMP) + $(REMOVE)/$(AIO-GRAB_DIR) $(GET-GIT-SOURCE) $(AIO-GRAB_SITE)/$(AIO-GRAB_SOURCE) $(DL_DIR)/$(AIO-GRAB_SOURCE) $(CPDIR)/$(AIO-GRAB_SOURCE) - $(CHDIR)/$(AIO-GRAB_TMP); \ + $(CHDIR)/$(AIO-GRAB_DIR); \ aclocal --force -I m4; \ libtoolize --copy --ltdl --force; \ autoconf --force; \ @@ -1681,21 +1681,21 @@ aio-grab: $(AIO-GRAB_DEPS) | $(TARGET_DIR) ; \ $(MAKE) all; \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(AIO-GRAB_TMP) + $(REMOVE)/$(AIO-GRAB_DIR) $(TOUCH) # ----------------------------------------------------------------------------- DVBSNOOP_VER = git -DVBSNOOP_TMP = dvbsnoop.$(DVBSNOOP_VER) +DVBSNOOP_DIR = dvbsnoop.$(DVBSNOOP_VER) DVBSNOOP_SOURCE = dvbsnoop.$(DVBSNOOP_VER) DVBSNOOP_SITE = https://github.com/Duckbox-Developers dvbsnoop: | $(TARGET_DIR) - $(REMOVE)/$(DVBSNOOP_TMP) + $(REMOVE)/$(DVBSNOOP_DIR) $(GET-GIT-SOURCE) $(DVBSNOOP_SITE)/$(DVBSNOOP_SOURCE) $(DL_DIR)/$(DVBSNOOP_SOURCE) $(CPDIR)/$(DVBSNOOP_SOURCE) - $(CHDIR)/$(DVBSNOOP_TMP); \ + $(CHDIR)/$(DVBSNOOP_DIR); \ $(CONFIGURE) \ --enable-silent-rules \ --prefix= \ @@ -1703,13 +1703,13 @@ dvbsnoop: | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(DVBSNOOP_TMP) + $(REMOVE)/$(DVBSNOOP_DIR) $(TOUCH) # ----------------------------------------------------------------------------- ETHTOOL_VER = 5.4 -ETHTOOL_TMP = ethtool-$(ETHTOOL_VER) +ETHTOOL_DIR = ethtool-$(ETHTOOL_VER) ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VER).tar.xz ETHTOOL_SITE = https://www.kernel.org/pub/software/network/ethtool @@ -1717,9 +1717,9 @@ $(DL_DIR)/$(ETHTOOL_SOURCE): $(DOWNLOAD) $(ETHTOOL_SITE)/$(ETHTOOL_SOURCE) ethtool: $(DL_DIR)/$(ETHTOOL_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(ETHTOOL_TMP) + $(REMOVE)/$(ETHTOOL_DIR) $(UNTAR)/$(ETHTOOL_SOURCE) - $(CHDIR)/$(ETHTOOL_TMP); \ + $(CHDIR)/$(ETHTOOL_DIR); \ $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ @@ -1728,13 +1728,13 @@ ethtool: $(DL_DIR)/$(ETHTOOL_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(ETHTOOL_TMP) + $(REMOVE)/$(ETHTOOL_DIR) $(TOUCH) # ----------------------------------------------------------------------------- GPTFDISK_VER = 1.0.4 -GPTFDISK_TMP = gptfdisk-$(GPTFDISK_VER) +GPTFDISK_DIR = gptfdisk-$(GPTFDISK_VER) GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VER).tar.gz GPTFDISK_SITE = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VER) @@ -1746,22 +1746,22 @@ GPTFDISK_PATCH = gptfdisk-ldlibs.patch GPTFDISK_DEPS = popt e2fsprogs gptfdisk: $(GPTFDISK_DEPS) $(DL_DIR)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(GPTFDISK_TMP) + $(REMOVE)/$(GPTFDISK_DIR) $(UNTAR)/$(GPTFDISK_SOURCE) - $(CHDIR)/$(GPTFDISK_TMP); \ + $(CHDIR)/$(GPTFDISK_DIR); \ $(call apply_patches, $(GPTFDISK_PATCH)); \ sed -i 's|^CC=.*|CC=$(TARGET_CC)|' Makefile; \ sed -i 's|^CXX=.*|CXX=$(TARGET_CXX)|' Makefile; \ $(MAKE_ENV) \ $(MAKE) sgdisk; \ $(INSTALL_EXEC) -D sgdisk $(TARGET_DIR)/sbin/sgdisk - $(REMOVE)/$(GPTFDISK_TMP) + $(REMOVE)/$(GPTFDISK_DIR) $(TOUCH) # ----------------------------------------------------------------------------- RSYNC_VER = 3.1.3 -RSYNC_TMP = rsync-$(RSYNC_VER) +RSYNC_DIR = rsync-$(RSYNC_VER) RSYNC_SOURCE = rsync-$(RSYNC_VER).tar.gz RSYNC_SITE = https://ftp.samba.org/pub/rsync @@ -1771,9 +1771,9 @@ $(DL_DIR)/$(RSYNC_SOURCE): RSYNC_DEPS = zlib popt rsync: $(RSYNC_DEPS) $(DL_DIR)/$(RSYNC_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(RSYNC_TMP) + $(REMOVE)/$(RSYNC_DIR) $(UNTAR)/$(RSYNC_SOURCE) - $(CHDIR)/$(RSYNC_TMP); \ + $(CHDIR)/$(RSYNC_DIR); \ $(CONFIGURE) \ --prefix= \ --mandir=$(remove-mandir) \ @@ -1785,13 +1785,13 @@ rsync: $(RSYNC_DEPS) $(DL_DIR)/$(RSYNC_SOURCE) | $(TARGET_DIR) ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGET_DIR) - $(REMOVE)/$(RSYNC_TMP) + $(REMOVE)/$(RSYNC_DIR) $(TOUCH) # ----------------------------------------------------------------------------- SYSVINIT_VER = 2.97 -SYSVINIT_TMP = sysvinit-$(SYSVINIT_VER) +SYSVINIT_DIR = sysvinit-$(SYSVINIT_VER) SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VER).tar.xz SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit @@ -1800,7 +1800,7 @@ $(DL_DIR)/$(SYSVINIT_SOURCE): define SYSVINIT_INSTALL for sbin in halt init shutdown killall5; do \ - $(INSTALL_EXEC) -D $(BUILD_DIR)/$(SYSVINIT_TMP)/src/$$sbin $(TARGET_DIR)/sbin/$$sbin || exit 1; \ + $(INSTALL_EXEC) -D $(BUILD_DIR)/$(SYSVINIT_DIR)/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 @@ -1808,14 +1808,14 @@ define SYSVINIT_INSTALL endef sysvinit: $(DL_DIR)/$(SYSVINIT_SOURCE) | $(TARGET_DIR) - $(REMOVE)/$(SYSVINIT_TMP) + $(REMOVE)/$(SYSVINIT_DIR) $(UNTAR)/$(SYSVINIT_SOURCE) - $(CHDIR)/$(SYSVINIT_TMP); \ + $(CHDIR)/$(SYSVINIT_DIR); \ $(APPLY_PATCHES); \ $(MAKE_ENV) \ $(MAKE) -C src SULOGINLIBS=-lcrypt $(SYSVINIT_INSTALL) - $(REMOVE)/$(SYSVINIT_TMP) + $(REMOVE)/$(SYSVINIT_DIR) $(TOUCH) # -----------------------------------------------------------------------------