diff --git a/make/crosstool.mk b/make/crosstool.mk index 1ae533b2..bb37508b 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -13,7 +13,7 @@ crosstools: # ----------------------------------------------------------------------------- -CROSSTOOL_BACKUP = $(ARCHIVE)/crosstool-ng-$(BOXARCH)-linux-$(KERNEL_VER)-backup.tar.gz +CROSSTOOL_BACKUP = $(DL_DIR)/crosstool-ng-$(BOXARCH)-linux-$(KERNEL_VER)-backup.tar.gz $(CROSSTOOL_BACKUP): $(call draw_line); @@ -71,7 +71,7 @@ GCC-LINARO_VER = 4.9-2017.01 GCC-LINARO_SOURCE = gcc-linaro-$(GCC-LINARO_VER).tar.xz GCC-LINARO_SITE = https://releases.linaro.org/components/toolchain/gcc-linaro/$(GCC-LINARO_VER) -$(ARCHIVE)/$(GCC-LINARO_SOURCE): +$(DL_DIR)/$(GCC-LINARO_SOURCE): $(DOWNLOAD) $(GCC-LINARO_SITE)/$(GCC-LINARO_SOURCE) UCLIBC_VER = 1.0.24 @@ -79,13 +79,13 @@ UCLIBC_VER = 1.0.24 # ----------------------------------------------------------------------------- # crosstool for arm-hd2 depends on gcc-linaro -$(CROSS_BASE)/arm/hd2: $(ARCHIVE)/$(GCC-LINARO_SOURCE) +$(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC-LINARO_SOURCE) $(CROSS_DIR): | $(BUILD_TMP) make $(BUILD_TMP)/linux-$(KERNEL_VER).tar # $(REMOVE)/$(CROSSTOOL-NG_TMP) - $(GET-GIT-SOURCE) $(CROSSTOOL-NG_SITE)/$(CROSSTOOL-NG_SOURCE) $(ARCHIVE)/$(CROSSTOOL-NG_SOURCE) + $(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); \ @@ -100,7 +100,7 @@ endif 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; \ - export NI_LOCAL_TARBALLS_DIR=$(ARCHIVE); \ + export NI_LOCAL_TARBALLS_DIR=$(DL_DIR); \ export NI_PREFIX_DIR=$(@); \ export NI_KERNEL_VERSION=$(KERNEL_VER); \ export NI_KERNEL_LOCATION=$(BUILD_TMP)/linux-$(KERNEL_VER).tar; \ diff --git a/make/environment-build.mk b/make/environment-build.mk index a7c483fc..d2b5fb2e 100644 --- a/make/environment-build.mk +++ b/make/environment-build.mk @@ -30,7 +30,7 @@ MAKEFLAGS += --no-print-directory BASE_DIR := $(shell pwd) MAINTAINER ?= unknown WHOAMI := $(shell id -un) -ARCHIVE = $(BASE_DIR)/download +DL_DIR = $(BASE_DIR)/download BUILD_TMP = $(BASE_DIR)/build_tmp ROOTFS = $(BUILD_TMP)/rootfs ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd5x)) @@ -208,12 +208,12 @@ PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig # ----------------------------------------------------------------------------- -# download archives into archives directory -DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(ARCHIVE) +# download archives into download directory +DOWNLOAD = wget --no-check-certificate -t3 -T60 -c -P $(DL_DIR) # unpack archives into build directory -UNTAR = tar -C $(BUILD_TMP) -xf $(ARCHIVE) -UNZIP = unzip -d $(BUILD_TMP) -o $(ARCHIVE) +UNTAR = tar -C $(BUILD_TMP) -xf $(DL_DIR) +UNZIP = unzip -d $(BUILD_TMP) -o $(DL_DIR) # clean up REMOVE = rm -rf $(BUILD_TMP) @@ -225,7 +225,7 @@ PATCH = patch -p1 -i $(PATCHES) CD = set -e; cd CHDIR = $(CD) $(BUILD_TMP) MKDIR = mkdir -p $(BUILD_TMP) -CPDIR = cp -a -t $(BUILD_TMP) $(ARCHIVE) +CPDIR = cp -a -t $(BUILD_TMP) $(DL_DIR) #TOUCH = @touch $(DEPS_DIR)/$(@) TOUCH = @touch $(if $(findstring host-,$(@)),$(HOST_DEPS_DIR),$(DEPS_DIR))/$(@) diff --git a/make/helpers.mk b/make/helpers.mk index bee28bec..afb74be0 100644 --- a/make/helpers.mk +++ b/make/helpers.mk @@ -65,7 +65,6 @@ define rewrite_libtool $(REWRITE_LIBTOOL)/$${la}; \ echo -e "\n# Adapted to buildsystem\n$(REWRITE_LIBTOOL_TAG)" >> $${la}; \ fi; \ - done endef # rewrite libtool libraries automatically @@ -180,13 +179,13 @@ endef archives-list: @rm -f $(BUILD_TMP)/$(@) - @make -qp | grep --only-matching '^\$(ARCHIVE).*:' | sed "s|:||g" > $(BUILD_TMP)/$(@) + @make -qp | grep --only-matching '^\$(DL_DIR).*:' | sed "s|:||g" > $(BUILD_TMP)/$(@) DOCLEANUP ?= no GETMISSING ?= no archives-info: archives-list @echo "[ ** ] Unused targets in make/archives.mk" - @grep --only-matching '^\$$(ARCHIVE).*:' make/archives.mk | sed "s|:||g" | \ + @grep --only-matching '^\$$(DL_DIR).*:' make/archives.mk | sed "s|:||g" | \ while read target; do \ found=false; \ for makefile in make/*.mk; do \ @@ -208,7 +207,7 @@ archives-info: archives-list fi; \ done; @echo "[ ** ] Unused archives" - @find $(ARCHIVE)/ -maxdepth 1 -type f | \ + @find $(DL_DIR)/ -maxdepth 1 -type f | \ while read archive; do \ if ! grep -q $$archive $(BUILD_TMP)/archives-list; then \ echo -e "[$(TERM_YELLOW) rm $(TERM_NORMAL)] $$archive"; \ diff --git a/make/host-tools.mk b/make/host-tools.mk index 94ea63d3..cd66aee4 100644 --- a/make/host-tools.mk +++ b/make/host-tools.mk @@ -39,13 +39,13 @@ HOST_PKG-CONFIG_TMP = 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 -$(ARCHIVE)/$(HOST_PKG-CONFIG_SOURCE): +$(DL_DIR)/$(HOST_PKG-CONFIG_SOURCE): $(DOWNLOAD) $(HOST_PKG-CONFIG_SITE)/$(HOST_PKG-CONFIG_SOURCE) HOST_PKG-CONFIG = $(HOST_DIR)/bin/pkg-config host-pkg-config: $(HOST_PKG-CONFIG) -$(HOST_PKG-CONFIG): $(ARCHIVE)/$(HOST_PKG-CONFIG_SOURCE) | $(HOST_DIR) pkg-config-preqs +$(HOST_PKG-CONFIG): $(DL_DIR)/$(HOST_PKG-CONFIG_SOURCE) | $(HOST_DIR) pkg-config-preqs $(REMOVE)/$(HOST_PKG-CONFIG_TMP) $(UNTAR)/$(HOST_PKG-CONFIG_SOURCE) $(CHDIR)/$(HOST_PKG-CONFIG_TMP); \ @@ -63,13 +63,13 @@ HOST_PKGCONF_TMP = pkgconf-$(HOST_PKGCONF_VER) HOST_PKGCONF_SOURCE = pkgconf-$(HOST_PKGCONF_VER).tar.gz HOST_PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf -$(ARCHIVE)/$(HOST_PKGCONF_SOURCE): +$(DL_DIR)/$(HOST_PKGCONF_SOURCE): $(DOWNLOAD) $(HOST_PKGCONF_SITE)/$(HOST_PKGCONF_SOURCE) HOST_PKGCONF_PATCH = 0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch HOST_PKGCONF_PATCH += 0002-Revert-main-assume-modversion-insted-of-version-if-o.patch -host-pkgconf: $(ARCHIVE)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs +host-pkgconf: $(DL_DIR)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR) pkg-config-preqs $(REMOVE)/$(HOST_PKGCONF_TMP) $(UNTAR)/$(HOST_PKGCONF_SOURCE) $(CHDIR)/$(HOST_PKGCONF_TMP); \ @@ -97,10 +97,10 @@ HOST_MTD-UTILS_TMP = 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 -#$(ARCHIVE)/$(HOST_MTD-UTILS_SOURCE): +#$(DL_DIR)/$(HOST_MTD-UTILS_SOURCE): # $(DOWNLOAD) $(HOST_MTD-UTILS_SITE)/$(HOST_MTD-UTILS_SOURCE) -host-mtd-utils: $(ARCHIVE)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR) +host-mtd-utils: $(DL_DIR)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_MTD-UTILS_TMP) $(UNTAR)/$(HOST_MTD-UTILS_SOURCE) $(CHDIR)/$(HOST_MTD-UTILS_TMP); \ @@ -127,11 +127,11 @@ HOST_U-BOOT_TMP = 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 -$(ARCHIVE)/$(HOST_U-BOOT_SOURCE): +$(DL_DIR)/$(HOST_U-BOOT_SOURCE): $(DOWNLOAD) $(HOST_U-BOOT_SITE)/$(HOST_U-BOOT_SOURCE) host-mkimage: $(HOST_DIR)/bin/mkimage -$(HOST_DIR)/bin/mkimage: $(ARCHIVE)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR) +$(HOST_DIR)/bin/mkimage: $(DL_DIR)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_U-BOOT_TMP) $(UNTAR)/$(HOST_U-BOOT_SOURCE) $(CHDIR)/$(HOST_U-BOOT_TMP); \ @@ -148,7 +148,7 @@ HOST_TZCODE_TMP = tzcode$(HOST_TZCODE_VER) HOST_TZCODE_SOURCE = tzcode$(HOST_TZCODE_VER).tar.gz HOST_TZCODE_SITE = ftp://ftp.iana.org/tz/releases -$(ARCHIVE)/$(HOST_TZCODE_SOURCE): +$(DL_DIR)/$(HOST_TZCODE_SOURCE): $(DOWNLOAD) $(HOST_TZCODE_SITE)/$(HOST_TZCODE_SOURCE) HOST_TZDATA_VER = $(TZDATA_VER) @@ -156,17 +156,17 @@ HOST_TZDATA_TMP = tzdata$(HOST_TZDATA_VER) HOST_TZDATA_SOURCE = tzdata$(HOST_TZDATA_VER).tar.gz HOST_TZDATA_SITE = ftp://ftp.iana.org/tz/releases -#$(ARCHIVE)/$(HOST_TZDATA_SOURCE): +#$(DL_DIR)/$(HOST_TZDATA_SOURCE): # $(DOWNLOAD) $(HOST_TZDATA_SITE)/$(HOST_TZDATA_SOURCE) HOST_ZIC = $(HOST_DIR)/sbin/zic -host-zic: $(ARCHIVE)/$(HOST_TZDATA_SOURCE) $(ARCHIVE)/$(HOST_TZCODE_SOURCE) | $(HOST_DIR) +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); \ - tar -xf $(ARCHIVE)/$(HOST_TZCODE_SOURCE); \ - tar -xf $(ARCHIVE)/$(HOST_TZDATA_SOURCE); \ + tar -xf $(DL_DIR)/$(HOST_TZCODE_SOURCE); \ + tar -xf $(DL_DIR)/$(HOST_TZDATA_SOURCE); \ $(MAKE) zic $(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_TZCODE_TMP)/zic $(HOST_ZIC) $(REMOVE)/$(HOST_TZCODE_TMP) @@ -179,13 +179,13 @@ HOST_PARTED_TMP = parted-$(HOST_PARTED_VER) HOST_PARTED_SOURCE = parted-$(HOST_PARTED_VER).tar.xz HOST_PARTED_SITE = https://ftp.gnu.org/gnu/parted -#$(ARCHIVE)/$(HOST_PARTED_SOURCE): +#$(DL_DIR)/$(HOST_PARTED_SOURCE): # $(DOWNLOAD) $(HOST_PARTED_SITE)/$(HOST_PARTED_SOURCE) HOST_PARTED_PATCH = parted-device-mapper.patch HOST_PARTED_PATCH += parted-sysmacros.patch -host-parted: $(ARCHIVE)/$(HOST_PARTED_SOURCE) | $(HOST_DIR) +host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_PARTED_TMP) $(UNTAR)/$(HOST_PARTED_SOURCE) $(CHDIR)/$(HOST_PARTED_TMP); \ @@ -210,10 +210,10 @@ HOST_DOSFSTOOLS_TMP = 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) -#$(ARCHIVE)/$(HOST_DOSFSTOOLS_SOURCE): +#$(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE): # $(DOWNLOAD) $(HOST_DOSFSTOOLS_SITE)/$(HOST_DOSFSTOOLS_SOURCE) -host-dosfstools: $(ARCHIVE)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR) +host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_DOSFSTOOLS_TMP) $(UNTAR)/$(HOST_DOSFSTOOLS_SOURCE) $(CHDIR)/$(HOST_DOSFSTOOLS_TMP); \ @@ -236,10 +236,10 @@ HOST_MTOOLS_TMP = mtools-$(HOST_MTOOLS_VER) HOST_MTOOLS_SOURCE = mtools-$(HOST_MTOOLS_VER).tar.gz HOST_MTOOLS_SITE = ftp://ftp.gnu.org/gnu/mtools -$(ARCHIVE)/$(HOST_MTOOLS_SOURCE): +$(DL_DIR)/$(HOST_MTOOLS_SOURCE): $(DOWNLOAD) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE) -host-mtools: $(ARCHIVE)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR) +host-mtools: $(DL_DIR)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_MTOOLS_TMP) $(UNTAR)/$(HOST_MTOOLS_SOURCE) $(CHDIR)/$(HOST_MTOOLS_TMP); \ @@ -258,10 +258,10 @@ HOST_E2FSPROGS_TMP = 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) -#$(ARCHIVE)/$(HOST_E2FSPROGS_SOURCE): +#$(DL_DIR)/$(HOST_E2FSPROGS_SOURCE): # $(DOWNLOAD) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE) -host-e2fsprocs: $(ARCHIVE)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR) +host-e2fsprocs: $(DL_DIR)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_E2FSPROGS_TMP) $(UNTAR)/$(HOST_E2FSPROGS_SOURCE) $(CHDIR)/$(HOST_E2FSPROGS_TMP); \ @@ -284,10 +284,10 @@ HOST_NINJA_PATCH = ninja/0001-set-minimum-cmake-version-to-3.10.patch HOST_NINJA_PATCH += ninja/0002-remove-fdiagnostics-color-from-make-command.patch HOST_NINJA_PATCH += ninja/0003-CMake-fix-object-library-usage.patch -$(ARCHIVE)/$(HOST_NINJA_SOURCE): +$(DL_DIR)/$(HOST_NINJA_SOURCE): $(DOWNLOAD) $(HOST_NINJA_SITE)/$(HOST_NINJA_SOURCE) -host-ninja: $(ARCHIVE)/$(HOST_NINJA_SOURCE) | $(HOST_DIR) +host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_NINJA_TMP) $(UNTAR)/$(HOST_NINJA_SOURCE) $(CHDIR)/$(HOST_NINJA_TMP); \ @@ -307,7 +307,7 @@ HOST_LUA_TMP = lua-$(HOST_LUA_VER) HOST_LUA_SOURCE = lua-$(HOST_LUA_VER).tar.gz HOST_LUA_SITE = http://www.lua.org/ftp -#$(ARCHIVE)/$(HOST_LUA_SOURCE): +#$(DL_DIR)/$(HOST_LUA_SOURCE): # $(DOWNLOAD) $(HOST_LUA_SITE)/$(HOST_LUA_SOURCE) HOST_LUA_PATCH = lua-01-fix-LUA_ROOT.patch @@ -315,7 +315,7 @@ HOST_LUA_PATCH += lua-01-remove-readline.patch HOST_LUA = $(HOST_DIR)/bin/lua -host-lua: $(ARCHIVE)/$(HOST_LUA_SOURCE) | $(HOST_DIR) +host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_LUA_TMP) $(UNTAR)/$(HOST_LUA_SOURCE) $(CHDIR)/$(HOST_LUA_TMP); \ @@ -332,7 +332,7 @@ HOST_LUAROCKS_TMP = luarocks-$(HOST_LUAROCKS_VER) HOST_LUAROCKS_SOURCE = luarocks-$(HOST_LUAROCKS_VER).tar.gz HOST_LUAROCKS_SITE = https://luarocks.github.io/luarocks/releases -$(ARCHIVE)/$(HOST_LUAROCKS_SOURCE): +$(DL_DIR)/$(HOST_LUAROCKS_SOURCE): $(DOWNLOAD) $(HOST_LUAROCKS_SITE)/$(HOST_LUAROCKS_SOURCE) HOST_LUAROCKS_PATCH = luarocks-0001-allow-libluajit-detection.patch @@ -352,7 +352,7 @@ HOST_LUAROCKS_MAKE_ENV = \ HOST_LUAROCKS = $(HOST_DIR)/bin/luarocks host-luarocks: $(HOST_LUAROCKS) -$(HOST_LUAROCKS): $(HOST_LUA) $(ARCHIVE)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR) +$(HOST_LUAROCKS): $(HOST_LUA) $(DL_DIR)/$(HOST_LUAROCKS_SOURCE) | $(HOST_DIR) $(REMOVE)/$(HOST_LUAROCKS_TMP) $(UNTAR)/$(HOST_LUAROCKS_SOURCE) $(CHDIR)/$(HOST_LUAROCKS_TMP); \ diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk index e30fe9ed..d4a1be7a 100644 --- a/make/linux-drivers.mk +++ b/make/linux-drivers.mk @@ -9,7 +9,7 @@ RTL8192EU_SITE = https://github.com/mange/$(RTL8192EU_SOURCE) rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR) $(REMOVE)/$(RTL8192EU_SOURCE) - $(GET-GIT-SOURCE) $(RTL8192EU_SITE) $(ARCHIVE)/$(RTL8192EU_SOURCE) + $(GET-GIT-SOURCE) $(RTL8192EU_SITE) $(DL_DIR)/$(RTL8192EU_SOURCE) $(CPDIR)/$(RTL8192EU_SOURCE) $(CHDIR)/$(RTL8192EU_SOURCE); \ $(MAKE) $(KERNEL_MAKEVARS); \ @@ -25,7 +25,7 @@ HD6x-MALI-DRIVERS_TMP = $(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 -$(ARCHIVE)/$(HD6x-MALI-DRIVERS_SOURCE): +$(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE): $(DOWNLOAD) $(HD6x-MALI-DRIVERS_SITE)/$(HD6x-MALI-DRIVERS_SOURCE) HD6x-MALI-DRIVERS_PATCH = hi3798mv200-support.patch @@ -39,7 +39,7 @@ HD6x-MALI-DRIVERS_MAKEVARS = \ CONFIG_MALI_DVFS=y \ CONFIG_GPU_AVS_ENABLE=y -hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(ARCHIVE)/$(HD6x-MALI-DRIVERS_SOURCE) | $(TARGET_DIR) +hd6x-mali-drivers: kernel-$(BOXTYPE) hd6x-libgles-headers $(DL_DIR)/$(HD6x-MALI-DRIVERS_SOURCE) | $(TARGET_DIR) $(START_BUILD) $(REMOVE)/$(HD6x-MALI-DRIVERS_TMP) $(UNTAR)/$(HD6x-MALI-DRIVERS_SOURCE) diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk index 45093781..a13d872b 100644 --- a/make/linux-kernel.mk +++ b/make/linux-kernel.mk @@ -190,10 +190,10 @@ VUDUO_PATCH = \ # ----------------------------------------------------------------------------- -$(ARCHIVE)/$(KERNEL_SOURCE): +$(DL_DIR)/$(KERNEL_SOURCE): $(DOWNLOAD) $(KERNEL_SITE)/$(KERNEL_SOURCE) -$(ARCHIVE)/$(VMLINUZ-INITRD_SOURCE): +$(DL_DIR)/$(VMLINUZ-INITRD_SOURCE): $(DOWNLOAD) $(VMLINUZ-INITRD_SITE)/$(VMLINUZ-INITRD_SOURCE) # ----------------------------------------------------------------------------- @@ -223,7 +223,7 @@ kernel.do_prepare.git: $(CD) $(BUILD_TMP); \ mv $(NI-LINUX-KERNEL) $(KERNEL_TMP) -kernel.do_prepare.tar: $(ARCHIVE)/$(KERNEL_SOURCE) +kernel.do_prepare.tar: $(DL_DIR)/$(KERNEL_SOURCE) $(REMOVE)/$(KERNEL_TMP) $(UNTAR)/$(KERNEL_SOURCE) $(CHDIR)/$(KERNEL_TMP); \ @@ -339,7 +339,7 @@ kernel-modules-mipsbox: kernel-mipsbox # ----------------------------------------------------------------------------- -vmlinuz-initrd: $(ARCHIVE)/$(VMLINUZ-INITRD_SOURCE) +vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ-INITRD_SOURCE) $(UNTAR)/$(VMLINUZ-INITRD_SOURCE) $(TOUCH) diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk index ae5c4de4..b732df5c 100644 --- a/make/neutrino-plugins.mk +++ b/make/neutrino-plugins.mk @@ -185,7 +185,7 @@ NEUTRINO-MEDIATHEK_SITE = https://github.com/neutrino-mediathek neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR) $(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP) - $(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_SITE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(ARCHIVE)/$(NEUTRINO-MEDIATHEK_SOURCE) + $(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_SITE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(DL_DIR)/$(NEUTRINO-MEDIATHEK_SOURCE) $(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE) $(CHDIR)/$(NEUTRINO-MEDIATHEK_TMP); \ $(INSTALL_COPY) plugins/* $(SHARE_PLUGINS)/; \ @@ -203,7 +203,7 @@ LINKS_TMP = links-$(LINKS_VER) LINKS_SOURCE = links-$(LINKS_VER).tar.bz2 LINKS_SITE = http://links.twibright.com/download -$(ARCHIVE)/$(LINKS_SOURCE): +$(DL_DIR)/$(LINKS_SOURCE): $(DOWNLOAD) $(LINKS_SITE)/$(LINKS_SOURCE) LINKS_DEPS = libpng libjpeg-turbo openssl @@ -220,7 +220,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), h7)) LINKS_PATCH += links-input-event2.patch endif -links: $(LINKS_DEPS) $(ARCHIVE)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) +links: $(LINKS_DEPS) $(DL_DIR)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR) $(REMOVE)/$(LINKS_TMP) $(UNTAR)/$(LINKS_SOURCE) $(CHDIR)/$(LINKS_TMP)/intl; \ diff --git a/make/target-blobs.mk b/make/target-blobs.mk index a24536ae..94a7994b 100644 --- a/make/target-blobs.mk +++ b/make/target-blobs.mk @@ -118,7 +118,7 @@ BOXMODEL-DRIVERS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-DRIVERS_SOURCE) BOXMODEL-DRIVERS_SITE = $($(call UPPERCASE,$(BOXMODEL))-DRIVERS_SITE) ifneq ($(BOXMODEL-DRIVERS_SOURCE),$(EMPTY)) -$(ARCHIVE)/$(BOXMODEL-DRIVERS_SOURCE): +$(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE): $(DOWNLOAD) $(BOXMODEL-DRIVERS_SITE)/$(BOXMODEL-DRIVERS_SOURCE) endif @@ -144,16 +144,16 @@ endif hd51-drivers \ bre2ze4k-drivers \ -h7-drivers: $(ARCHIVE)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) +h7-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) mkdir -p $(TARGET_MODULES_DIR)/extra - unzip -o $(ARCHIVE)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_MODULES_DIR)/extra + unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_MODULES_DIR)/extra make depmod $(TOUCH) hd60-drivers \ -hd61-drivers: $(ARCHIVE)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) +hd61-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) mkdir -p $(TARGET_MODULES_DIR)/extra - unzip -o $(ARCHIVE)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_MODULES_DIR)/extra + unzip -o $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -d $(TARGET_MODULES_DIR)/extra rm -f $(TARGET_MODULES_DIR)/extra/hi_play.ko mv $(TARGET_MODULES_DIR)/extra/turnoff_power $(TARGET_DIR)/bin make depmod @@ -167,9 +167,9 @@ vuzero4k-drivers \ vuuno4k-drivers \ vuuno4kse-drivers \ vuduo-drivers \ -vuplus-drivers: $(ARCHIVE)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) +vuplus-drivers: $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) | $(TARGET_DIR) mkdir -p $(TARGET_MODULES_DIR)/extra - tar -xf $(ARCHIVE)/$(BOXMODEL-DRIVERS_SOURCE) -C $(TARGET_MODULES_DIR)/extra + tar -xf $(DL_DIR)/$(BOXMODEL-DRIVERS_SOURCE) -C $(TARGET_MODULES_DIR)/extra make depmod $(TOUCH) @@ -246,28 +246,28 @@ BOXMODEL-LIBGLES_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SOURCE) BOXMODEL-LIBGLES_SITE = $($(call UPPERCASE,$(BOXMODEL))-LIBGLES_SITE) ifneq ($(BOXMODEL-LIBGLES_SOURCE),$(EMPTY)) -$(ARCHIVE)/$(BOXMODEL-LIBGLES_SOURCE): +$(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE): $(DOWNLOAD) $(BOXMODEL-LIBGLES_SITE)/$(BOXMODEL-LIBGLES_SOURCE) endif hd51-libgles \ bre2ze4k-libgles \ -h7-libgles: $(ARCHIVE)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) - unzip -o $(ARCHIVE)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_LIB_DIR) +h7-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) + unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_LIB_DIR) ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libEGL.so ln -sf libv3ddriver.so $(TARGET_LIB_DIR)/libGLESv2.so $(TOUCH) -$(ARCHIVE)/$(HD6x-LIBGLES-HEADERS_SOURCE): +$(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE): $(DOWNLOAD) $(HD6x-LIBGLES-HEADERS_SITE)/$(HD6x-LIBGLES-HEADERS_SOURCE) -hd6x-libgles-headers: $(ARCHIVE)/$(HD6x-LIBGLES-HEADERS_SOURCE) | $(TARGET_DIR) - unzip -o $(ARCHIVE)/$(HD6x-LIBGLES-HEADERS_SOURCE) -d $(TARGET_INCLUDE_DIR) +hd6x-libgles-headers: $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) | $(TARGET_DIR) + unzip -o $(DL_DIR)/$(HD6x-LIBGLES-HEADERS_SOURCE) -d $(TARGET_INCLUDE_DIR) $(TOUCH) hd60-libgles \ -hd61-libgles: $(ARCHIVE)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) - unzip -o $(ARCHIVE)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_LIB_DIR) +hd61-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) + unzip -o $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) -d $(TARGET_LIB_DIR) $(CD) $(TARGET_LIB_DIR); \ ln -sf libMali.so libmali.so; \ ln -sf libMali.so libEGL.so.1.4; ln -sf libEGL.so.1.4 libEGL.so.1; ln -sf libEGL.so.1 libEGL.so; \ @@ -284,7 +284,7 @@ vuultimo4k-libgles \ vuzero4k-libgles \ vuuno4k-libgles \ vuuno4kse-libgles \ -vuplus-libgles: $(ARCHIVE)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) +vuplus-libgles: $(DL_DIR)/$(BOXMODEL-LIBGLES_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-LIBGLES_TMP) $(UNTAR)/$(BOXMODEL-LIBGLES_SOURCE) $(INSTALL_EXEC) $(BUILD_TMP)/$(BOXMODEL-LIBGLES_TMP)/lib/* $(TARGET_LIB_DIR) @@ -314,14 +314,14 @@ BOXMODEL-LIBS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SOURCE) BOXMODEL-LIBS_SITE = $($(call UPPERCASE,$(BOXMODEL))-LIBS_SITE) ifneq ($(BOXMODEL-LIBS_SOURCE),$(EMPTY)) -$(ARCHIVE)/$(BOXMODEL-LIBS_SOURCE): +$(DL_DIR)/$(BOXMODEL-LIBS_SOURCE): $(DOWNLOAD) $(BOXMODEL-LIBS_SITE)/$(BOXMODEL-LIBS_SOURCE) endif hd60-libs \ -hd61-libs: $(ARCHIVE)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR) +hd61-libs: $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-LIBS_TMP) - unzip -o $(ARCHIVE)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_TMP)/$(BOXMODEL-LIBS_TMP) + unzip -o $(DL_DIR)/$(BOXMODEL-LIBS_SOURCE) -d $(BUILD_TMP)/$(BOXMODEL-LIBS_TMP) mkdir -p $(TARGET_USR_LIB_DIR)/hisilicon $(INSTALL_EXEC) $(BUILD_TMP)/$(BOXMODEL-LIBS_TMP)/hisilicon/* $(TARGET_USR_LIB_DIR)/hisilicon $(INSTALL_EXEC) $(BUILD_TMP)/$(BOXMODEL-LIBS_TMP)/ffmpeg/* $(TARGET_USR_LIB_DIR)/hisilicon @@ -374,11 +374,11 @@ BOXMODEL-PLATFORM-UTIL_SOURCE = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SO BOXMODEL-PLATFORM-UTIL_SITE = $($(call UPPERCASE,$(BOXMODEL))-PLATFORM-UTIL_SITE) ifneq ($(BOXMODEL-PLATFORM-UTIL_SOURCE),$(EMPTY)) -$(ARCHIVE)/$(BOXMODEL-PLATFORM-UTIL_SOURCE): +$(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE): $(DOWNLOAD) $(BOXMODEL-PLATFORM-UTIL_SITE)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) endif -vuplus-platform-util: $(ARCHIVE)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) +vuplus-platform-util: $(DL_DIR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BOXMODEL-PLATFORM-UTIL_TMP) $(UNTAR)/$(BOXMODEL-PLATFORM-UTIL_SOURCE) $(INSTALL_EXEC) -D $(BUILD_TMP)/$(BOXMODEL-PLATFORM-UTIL_TMP)/* $(TARGET_USR_BIN_DIR) diff --git a/make/target-development.mk b/make/target-development.mk index 500ec828..8dd1c67a 100644 --- a/make/target-development.mk +++ b/make/target-development.mk @@ -15,12 +15,12 @@ VALGRIND_TMP = valgrind-$(VALGRIND_VER) VALGRIND_SOURCE = valgrind-$(VALGRIND_VER).tar.bz2 VALGRIND_SITE = ftp://sourceware.org/pub/valgrind -$(ARCHIVE)/$(VALGRIND_SOURCE): +$(DL_DIR)/$(VALGRIND_SOURCE): $(DOWNLOAD) $(VALGRIND_SITE)/$(VALGRIND_SOURCE) VALGRIND_PATCH = valgrind-fix-build-$(TARGET_ARCH).patch -valgrind3: $(ARCHIVE)/$(VALGRIND_SOURCE) | $(TARGET_DIR) +valgrind3: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(VALGRIND_TMP) $(UNTAR)/$(VALGRIND_SOURCE) $(CHDIR)/$(VALGRIND_TMP); \ @@ -72,10 +72,10 @@ STRACE_TMP = strace-$(STRACE_VER) STRACE_SOURCE = strace-$(STRACE_VER).tar.xz STRACE_SITE = https://strace.io/files/$(STRACE_VER) -$(ARCHIVE)/$(STRACE_SOURCE): +$(DL_DIR)/$(STRACE_SOURCE): $(DOWNLOAD) $(STRACE_SITE)/$(STRACE_SOURCE) -strace: $(ARCHIVE)/$(STRACE_SOURCE) | $(TARGET_DIR) +strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(STRACE_TMP) $(UNTAR)/$(STRACE_SOURCE) $(CHDIR)/$(STRACE_TMP); \ @@ -97,12 +97,12 @@ GDB_TMP = gdb-$(GDB_VER) GDB_SOURCE = gdb-$(GDB_VER).tar.xz GDB_SITE = https://sourceware.org/pub/gdb/releases -$(ARCHIVE)/$(GDB_SOURCE): +$(DL_DIR)/$(GDB_SOURCE): $(DOWNLOAD) $(GDB_SITE)/$(GDB_SOURCE) GDB_DEPS = zlib ncurses -gdb: $(GDB_DEPS) $(ARCHIVE)/$(GDB_SOURCE) | $(TARGET_DIR) +gdb: $(GDB_DEPS) $(DL_DIR)/$(GDB_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(GDB_TMP) $(UNTAR)/$(GDB_SOURCE) $(CHDIR)/$(GDB_TMP); \ diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk index 586cf3cd..5f2f86a0 100644 --- a/make/target-ffmpeg.mk +++ b/make/target-ffmpeg.mk @@ -8,7 +8,7 @@ FFMPEG_TMP = ffmpeg-$(FFMPEG_VER) FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VER).tar.xz FFMPEG_SITE = http://www.ffmpeg.org/releases -$(ARCHIVE)/$(FFMPEG_SOURCE): +$(DL_DIR)/$(FFMPEG_SOURCE): $(DOWNLOAD) $(FFMPEG_SITE)/$(FFMPEG_SOURCE) FFMPEG_UNPATCHED := no @@ -342,7 +342,7 @@ endif # ----------------------------------------------------------------------------- -ffmpeg: $(FFMPEG_DEPS) $(ARCHIVE)/$(FFMPEG_SOURCE) | $(TARGET_DIR) +ffmpeg: $(FFMPEG_DEPS) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FFMPEG_TMP) $(UNTAR)/$(FFMPEG_SOURCE) ifneq ($(FFMPEG_UNPATCHED), yes) diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk index a3cca038..8da3946b 100644 --- a/make/target-libs-static.mk +++ b/make/target-libs-static.mk @@ -17,13 +17,13 @@ CORTEX-STRINGS_TMP = 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 -$(ARCHIVE)/$(CORTEX-STRINGS_SOURCE): - $(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_SITE) $(CORTEX-STRINGS_VER) $(@F) $(ARCHIVE) +$(DL_DIR)/$(CORTEX-STRINGS_SOURCE): + $(GET-GIT-ARCHIVE) $(CORTEX-STRINGS_SITE) $(CORTEX-STRINGS_VER) $(@F) $(DL_DIR) CORTEX-STRINGS_CONF = $(if $(filter $(BOXSERIES), hd5x hd6x vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse),--with-neon,--without-neon) cortex-strings: $(STATIC_LIB_DIR)/libcortex-strings.la -$(STATIC_LIB_DIR)/libcortex-strings.la: $(ARCHIVE)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR) +$(STATIC_LIB_DIR)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(STATIC_DIR) $(REMOVE)/$(CORTEX-STRINGS_TMP) $(UNTAR)/$(CORTEX-STRINGS_SOURCE) $(CHDIR)/$(CORTEX-STRINGS_TMP); \ diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk index 6d1647ea..1c477c9f 100644 --- a/make/target-libs-unused.mk +++ b/make/target-libs-unused.mk @@ -8,14 +8,14 @@ LIBID3TAG_TMP = libid3tag-$(LIBID3TAG_VER) LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VER).tar.gz LIBID3TAG_SITE = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3TAG_VER) -$(ARCHIVE)/$(LIBID3TAG_SOURCE): +$(DL_DIR)/$(LIBID3TAG_SOURCE): $(DOWNLOAD) $(LIBID3TAG_SITE)/$(LIBID3TAG_SOURCE) LIBID3TAG_PATCH = libid3tag-pc.patch LIBID3TAG_DEPS = zlib -libid3tag: $(LIBID3TAG_DEPS) $(ARCHIVE)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR) +libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBID3TAG_TMP) $(UNTAR)/$(LIBID3TAG_SOURCE) $(CHDIR)/$(LIBID3TAG_TMP); \ @@ -39,10 +39,10 @@ FLAC_TMP = flac-$(FLAC_VER) FLAC_SOURCE = flac-$(FLAC_VER).tar.xz FLAC_SITE = https://ftp.osuosl.org/pub/xiph/releases/flac -$(ARCHIVE)/$(FLAC_SOURCE): +$(DL_DIR)/$(FLAC_SOURCE): $(DOWNLOAD) $(FLAC_SITE)/$(FLAC_SOURCE) -libFLAC: $(ARCHIVE)/$(FLAC_SOURCE) | $(TARGET_DIR) +libFLAC: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBFLAC_TMP) $(UNTAR)/$(LIBFLAC_SOURCE) $(CHDIR)/$(LIBFLAC_TMP); \ @@ -73,12 +73,12 @@ BZIP2_TMP = bzip2-$(BZIP2_VER) BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz BZIP2_SITE = https://sourceware.org/pub/bzip2 -$(ARCHIVE)/$(BZIP2_SOURCE): +$(DL_DIR)/$(BZIP2_SOURCE): $(DOWNLOAD) $(BZIP2_SITE)/$(BZIP2_SOURCE) BZIP2_PATCH = bzip2.patch -bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR) +bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BZIP2_TMP) $(UNTAR)/$(BZIP2_SOURCE) $(CHDIR)/$(BZIP2_TMP); \ @@ -98,12 +98,12 @@ FONTCONFIG_TMP = fontconfig-$(FONTCONFIG_VER) FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VER).tar.bz2 FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release -$(ARCHIVE)/$(FONTCONFIG_SOURCE): +$(DL_DIR)/$(FONTCONFIG_SOURCE): $(DOWNLOAD) $(FONTCONFIG_SITE)/$(FONTCONFIG_SOURCE) FONTCONFIG_DEPS = freetype expat -fontconfig: $(FONTCONFIG_DEPS) $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR) +fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FONTCONFIG_TMP) $(UNTAR)/$(FONTCONFIG_SOURCE) $(CHDIR)/$(FONTCONFIG_TMP); \ @@ -129,7 +129,7 @@ PIXMAN_TMP = pixman-$(PIXMAN_VER) PIXMAN_SOURCE = pixman-$(PIXMAN_VER).tar.gz PIXMAN_SITE = https://www.cairographics.org/releases -$(ARCHIVE)/$(PIXMAN_SOURCE): +$(DL_DIR)/$(PIXMAN_SOURCE): $(DOWNLOAD) $(PIXMAN_SITE)/$(PIXMAN_SOURCE) PIXMAN_PATCH = pixman-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch @@ -138,7 +138,7 @@ PIXMAN_PATCH += pixman-0001-test-utils-Check-for-FE_INVALID-definition-before-us PIXMAN_DEPS = zlib libpng -pixman: $(PIXMAN_DEPS) $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR) +pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PIXMAN_TMP) $(UNTAR)/$(PIXMAN_SOURCE) $(CHDIR)/$(PIXMAN_TMP); \ @@ -164,14 +164,14 @@ CAIRO_TMP = cairo-$(CAIRO_VER) CAIRO_SOURCE = cairo-$(CAIRO_VER).tar.xz CAIRO_SITE = https://www.cairographics.org/releases -$(ARCHIVE)/$(CAIRO_SOURCE): +$(DL_DIR)/$(CAIRO_SOURCE): $(DOWNLOAD) $(CAIRO_SITE)/$(CAIRO_SOURCE) CAIRO_PATCH = cairo-get_bitmap_surface.diff CAIRO_DEPS = fontconfig glib2 libpng pixman zlib -cairo: $(CAIRO_DEPS) $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR) +cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(CAIRO_TMP) $(UNTAR)/$(CAIRO_SOURCE) $(CHDIR)/$(CAIRO_TMP); \ @@ -207,14 +207,14 @@ HARFBUZZ_TMP = harfbuzz-$(HARFBUZZ_VER) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VER).tar.bz2 HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release -$(ARCHIVE)/$(HARFBUZZ_SOURCE): +$(DL_DIR)/$(HARFBUZZ_SOURCE): $(DOWNLOAD) $(HARFBUZZ_SITE)/$(HARFBUZZ_SOURCE) HARFBUZZ_PATCH = harfbuzz-disable-docs.patch HARFBUZZ_DEPS = fontconfig glib2 cairo freetype -harfbuzz: $(HARFBUZZ_DEPS) $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) +harfbuzz: $(HARFBUZZ_DEPS) $(DL_DIR)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(HARFBUZZ_TMP) $(UNTAR)/$(HARFBUZZ_SOURCE) $(CHDIR)/$(HARFBUZZ_TMP); \ diff --git a/make/target-libs.mk b/make/target-libs.mk index 3d0d546c..227c7a3d 100644 --- a/make/target-libs.mk +++ b/make/target-libs.mk @@ -8,13 +8,13 @@ ZLIB_TMP = zlib-$(ZLIB_VER) ZLIB_SOURCE = zlib-$(ZLIB_VER).tar.xz ZLIB_SITE = https://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VER) -$(ARCHIVE)/$(ZLIB_SOURCE): +$(DL_DIR)/$(ZLIB_SOURCE): $(DOWNLOAD) $(ZLIB_SITE)/$(ZLIB_SOURCE) ZLIB_PATCH = zlib-ldflags-tests.patch ZLIB_PATCH += zlib-remove.ldconfig.call.patch -zlib: $(ARCHIVE)/$(ZLIB_SOURCE) | $(TARGET_DIR) +zlib: $(DL_DIR)/$(ZLIB_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(ZLIB_TMP) $(UNTAR)/$(ZLIB_SOURCE) $(CHDIR)/$(ZLIB_TMP); \ @@ -39,10 +39,10 @@ LIBFUSE_TMP = fuse-$(LIBFUSE_VER) LIBFUSE_SOURCE = fuse-$(LIBFUSE_VER).tar.gz LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VER) -$(ARCHIVE)/$(LIBFUSE_SOURCE): +$(DL_DIR)/$(LIBFUSE_SOURCE): $(DOWNLOAD) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE) -libfuse: $(ARCHIVE)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) +libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBFUSE_TMP) $(UNTAR)/$(LIBFUSE_SOURCE) $(CHDIR)/$(LIBFUSE_TMP); \ @@ -73,10 +73,10 @@ LIBUPNP_TMP = libupnp-$(LIBUPNP_VER) LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VER).tar.bz2 LIBUPNP_SITE = http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(LIBUPNP_VER) -$(ARCHIVE)/$(LIBUPNP_SOURCE): +$(DL_DIR)/$(LIBUPNP_SOURCE): $(DOWNLOAD) $(LIBUPNP_SITE)/$(LIBUPNP_SOURCE) -libupnp: $(ARCHIVE)/$(LIBUPNP_SOURCE) | $(TARGET_DIR) +libupnp: $(DL_DIR)/$(LIBUPNP_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBUPNP_TMP) $(UNTAR)/$(LIBUPNP_SOURCE) $(CHDIR)/$(LIBUPNP_TMP); \ @@ -103,7 +103,7 @@ LIBDVBSI_PATCH = libdvbsi++-content_identifier_descriptor.patch libdvbsi: | $(TARGET_DIR) $(REMOVE)/$(LIBDVBSI_TMP) - $(GET-GIT-SOURCE) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE) $(ARCHIVE)/$(LIBDVBSI_SOURCE) + $(GET-GIT-SOURCE) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE) $(DL_DIR)/$(LIBDVBSI_SOURCE) $(CPDIR)/$(LIBDVBSI_SOURCE) $(CHDIR)/$(LIBDVBSI_TMP); \ $(call apply_patches, $(LIBDVBSI_PATCH)); \ @@ -127,10 +127,10 @@ GIFLIB_TMP = giflib-$(GIFLIB_VER) GIFLIB_SOURCE = giflib-$(GIFLIB_VER).tar.gz GIFLIB_SITE = https://sourceforge.net/projects/giflib/files -$(ARCHIVE)/$(GIFLIB_SOURCE): +$(DL_DIR)/$(GIFLIB_SOURCE): $(DOWNLOAD) $(GIFLIB_SITE)/$(GIFLIB_SOURCE) -giflib: $(ARCHIVE)/$(GIFLIB_SOURCE) | $(TARGET_DIR) +giflib: $(DL_DIR)/$(GIFLIB_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(GIFLIB_TMP) $(UNTAR)/$(GIFLIB_SOURCE) $(CHDIR)/$(GIFLIB_TMP); \ @@ -147,14 +147,14 @@ LIBCURL_TMP = curl-$(LIBCURL_VER) LIBCURL_SOURCE = curl-$(LIBCURL_VER).tar.bz2 LIBCURL_SITE = https://curl.haxx.se/download -$(ARCHIVE)/$(LIBCURL_SOURCE): +$(DL_DIR)/$(LIBCURL_SOURCE): $(DOWNLOAD) $(LIBCURL_SITE)/$(LIBCURL_SOURCE) LIBCURL_DEPS = zlib openssl rtmpdump ca-bundle LIBCURL_CONF = $(if $(filter $(BOXSERIES), hd1),--disable-ipv6,--enable-ipv6) -libcurl: $(LIBCURL_DEPS) $(ARCHIVE)/$(LIBCURL_SOURCE) | $(TARGET_DIR) +libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBCURL_TMP) $(UNTAR)/$(LIBCURL_SOURCE) $(CHDIR)/$(LIBCURL_TMP); \ @@ -201,7 +201,7 @@ LIBPNG_TMP = libpng-$(LIBPNG_VER) LIBPNG_SOURCE = libpng-$(LIBPNG_VER).tar.xz LIBPNG_SITE = https://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_VER) -$(ARCHIVE)/$(LIBPNG_SOURCE): +$(DL_DIR)/$(LIBPNG_SOURCE): $(DOWNLOAD) $(LIBPNG_SITE)/$(LIBPNG_SOURCE) LIBPNG_PATCH = libpng-Disable-pngfix-and-png-fix-itxt.patch @@ -210,7 +210,7 @@ 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) $(ARCHIVE)/$(LIBPNG_SOURCE) | $(TARGET_DIR) +libpng: $(LIBPNG_DEPS) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBPNG_TMP) $(UNTAR)/$(LIBPNG_SOURCE) $(CHDIR)/$(LIBPNG_TMP); \ @@ -238,7 +238,7 @@ FREETYPE_TMP = freetype-$(FREETYPE_VER) FREETYPE_SOURCE = freetype-$(FREETYPE_VER).tar.xz FREETYPE_SITE = https://sourceforge.net/projects/freetype/files/freetype2/$(FREETYPE_VER) -$(ARCHIVE)/$(FREETYPE_SOURCE): +$(DL_DIR)/$(FREETYPE_SOURCE): $(DOWNLOAD) $(FREETYPE_SITE)/$(FREETYPE_SOURCE) FREETYPE_PATCH = freetype2-subpixel.patch @@ -247,7 +247,7 @@ FREETYPE_PATCH += freetype2-pkgconf.patch FREETYPE_DEPS = zlib libpng -freetype: $(FREETYPE_DEPS) $(ARCHIVE)/$(FREETYPE_SOURCE) | $(TARGET_DIR) +freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FREETYPE_TMP) $(UNTAR)/$(FREETYPE_SOURCE) $(CHDIR)/$(FREETYPE_TMP); \ @@ -287,12 +287,12 @@ LIBJPEG-TURBO_TMP = 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) -$(ARCHIVE)/$(LIBJPEG-TURBO_SOURCE): +$(DL_DIR)/$(LIBJPEG-TURBO_SOURCE): $(DOWNLOAD) $(LIBJPEG-TURBO_SITE)/$(LIBJPEG-TURBO_SOURCE) LIBJPEG-TURBO_PATCH = libjpeg-turbo-tiff-ojpeg.patch -libjpeg-turbo: $(ARCHIVE)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR) +libjpeg-turbo: $(DL_DIR)/$(LIBJPEG-TURBO_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBJPEG-TURBO_TMP) $(UNTAR)/$(LIBJPEG-TURBO_SOURCE) $(CHDIR)/$(LIBJPEG-TURBO_TMP); \ @@ -315,7 +315,7 @@ OPENSSL_TMP = openssl-$(OPENSSL_VER) OPENSSL_SOURCE = openssl-$(OPENSSL_VER).tar.gz OPENSSL_SITE = https://www.openssl.org/source -$(ARCHIVE)/$(OPENSSL_SOURCE): +$(DL_DIR)/$(OPENSSL_SOURCE): $(DOWNLOAD) $(OPENSSL_SITE)/$(OPENSSL_SOURCE) OPENSSL_PATCH = 0000-Configure-align-O-flag.patch @@ -326,7 +326,7 @@ else ifeq ($(BOXARCH), mips) OPENSSL_ARCH = linux-generic32 endif -openssl: $(ARCHIVE)/$(OPENSSL_SOURCE) | $(TARGET_DIR) +openssl: $(DL_DIR)/$(OPENSSL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(OPENSSL_TMP) $(UNTAR)/$(OPENSSL_SOURCE) $(CHDIR)/$(OPENSSL_TMP); \ @@ -381,12 +381,12 @@ NCURSES_TMP = ncurses-$(NCURSES_VER) NCURSES_SOURCE = ncurses-$(NCURSES_VER).tar.gz NCURSES_SITE = https://ftp.gnu.org/pub/gnu/ncurses -$(ARCHIVE)/$(NCURSES_SOURCE): +$(DL_DIR)/$(NCURSES_SOURCE): $(DOWNLOAD) $(NCURSES_SITE)/$(NCURSES_SOURCE) NCURSES_PATCH = ncurses-gcc-5.x-MKlib_gen.patch -ncurses: $(ARCHIVE)/$(NCURSES_SOURCE) | $(TARGET_DIR) +ncurses: $(DL_DIR)/$(NCURSES_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(NCURSES_TMP) $(UNTAR)/$(NCURSES_SOURCE) $(CHDIR)/$(NCURSES_TMP); \ @@ -446,10 +446,10 @@ LIBUSB_TMP = libusb-$(LIBUSB_VER) LIBUSB_SOURCE = libusb-$(LIBUSB_VER).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VER) -$(ARCHIVE)/$(LIBUSB_SOURCE): +$(DL_DIR)/$(LIBUSB_SOURCE): $(DOWNLOAD) $(LIBUSB_SITE)/$(LIBUSB_SOURCE) -libusb: $(ARCHIVE)/$(LIBUSB_SOURCE) | $(TARGET_DIR) +libusb: $(DL_DIR)/$(LIBUSB_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBUSB_TMP) $(UNTAR)/$(LIBUSB_SOURCE) $(CHDIR)/$(LIBUSB_TMP); \ @@ -471,14 +471,14 @@ LIBUSB-COMPAT_TMP = 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) -$(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE): +$(DL_DIR)/$(LIBUSB-COMPAT_SOURCE): $(DOWNLOAD) $(LIBUSB-COMPAT_SITE)/$(LIBUSB-COMPAT_SOURCE) LIBUSB-COMPAT_PATCH = 0001-fix-a-build-issue-on-linux.patch LUBUSB-COMPAT_DEPS = libusb -libusb-compat: $(LUBUSB-COMPAT_DEPS) $(ARCHIVE)/$(LIBUSB-COMPAT_SOURCE) | $(TARGET_DIR) +libusb-compat: $(LUBUSB-COMPAT_DEPS) $(DL_DIR)/$(LIBUSB-COMPAT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBUSB-COMPAT_TMP) $(UNTAR)/$(LIBUSB-COMPAT_SOURCE) $(CHDIR)/$(LIBUSB-COMPAT_TMP); \ @@ -502,12 +502,12 @@ LIBGD_TMP = libgd-$(LIBGD_VER) LIBGD_SOURCE = libgd-$(LIBGD_VER).tar.xz LIBGD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VER) -$(ARCHIVE)/$(LIBGD_SOURCE): +$(DL_DIR)/$(LIBGD_SOURCE): $(DOWNLOAD) $(LIBGD_SITE)/$(LIBGD_SOURCE) LIBGD_DEPS = zlib libpng libjpeg-turbo freetype -libgd: $(LIBGD_DEPS) $(ARCHIVE)/$(LIBGD_SOURCE) | $(TARGET_DIR) +libgd: $(LIBGD_DEPS) $(DL_DIR)/$(LIBGD_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBGD_TMP) $(UNTAR)/$(LIBGD_SOURCE) $(CHDIR)/$(LIBGD_TMP); \ @@ -539,7 +539,7 @@ LIBDPF_DEPS = libusb-compat libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR) $(REMOVE)/$(LIBDPF_TMP) - $(GET-GIT-SOURCE) $(LIBDPF_SITE)/$(LIBDPF_SOURCE) $(ARCHIVE)/$(LIBDPF_SOURCE) + $(GET-GIT-SOURCE) $(LIBDPF_SITE)/$(LIBDPF_SOURCE) $(DL_DIR)/$(LIBDPF_SOURCE) $(CPDIR)/$(LIBDPF_SOURCE) $(CHDIR)/$(LIBDPF_TMP)/dpflib; \ $(call apply_patches, $(LIBDPF_PATCH)); \ @@ -559,10 +559,10 @@ LZO_TMP = lzo-$(LZO_VER) LZO_SOURCE = lzo-$(LZO_VER).tar.gz LZO_SITE = https://www.oberhumer.com/opensource/lzo/download -$(ARCHIVE)/$(LZO_SOURCE): +$(DL_DIR)/$(LZO_SOURCE): $(DOWNLOAD) $(LZO_SITE)/$(LZO_SOURCE) -lzo: $(ARCHIVE)/$(LZO_SOURCE) | $(TARGET_DIR) +lzo: $(DL_DIR)/$(LZO_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LZO_TMP) $(UNTAR)/$(LZO_SOURCE) $(CHDIR)/$(LZO_TMP); \ @@ -584,10 +584,10 @@ LIBSIGC_TMP = libsigc++-$(LIBSIGC_VER) LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VER).tar.xz LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(basename $(LIBSIGC_VER)) -$(ARCHIVE)/$(LIBSIGC_SOURCE): +$(DL_DIR)/$(LIBSIGC_SOURCE): $(DOWNLOAD) $(LIBSIGC_SITE)/$(LIBSIGC_SOURCE) -libsigc: $(ARCHIVE)/$(LIBSIGC_SOURCE) | $(TARGET_DIR) +libsigc: $(DL_DIR)/$(LIBSIGC_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBSIGC_TMP) $(UNTAR)/$(LIBSIGC_SOURCE) $(CHDIR)/$(LIBSIGC_TMP); \ @@ -612,12 +612,12 @@ EXPAT_TMP = expat-$(EXPAT_VER) EXPAT_SOURCE = expat-$(EXPAT_VER).tar.bz2 EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VER) -$(ARCHIVE)/$(EXPAT_SOURCE): +$(DL_DIR)/$(EXPAT_SOURCE): $(DOWNLOAD) $(EXPAT_SITE)/$(EXPAT_SOURCE) EXPAT_PATCH = expat-libtool-tag.patch -expat: $(ARCHIVE)/$(EXPAT_SOURCE) | $(TARGET_DIR) +expat: $(DL_DIR)/$(EXPAT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(EXPAT_TMP) $(UNTAR)/$(EXPAT_SOURCE) $(CHDIR)/$(EXPAT_TMP); \ @@ -645,7 +645,7 @@ LIBBLURAY_TMP = libbluray-$(LIBBLURAY_VER) LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VER).tar.bz2 LIBBLURAY_SITE = ftp.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VER) -$(ARCHIVE)/$(LIBBLURAY_SOURCE): +$(DL_DIR)/$(LIBBLURAY_SOURCE): $(DOWNLOAD) $(LIBBLURAY_SITE)/$(LIBBLURAY_SOURCE) LIBBLURAY_PATCH = libbluray.patch @@ -655,7 +655,7 @@ ifeq ($(BOXSERIES), hd2) LIBBLURAY_DEPS += libaacs libbdplus endif -libbluray: $(LIBBLURAY_DEPS) $(ARCHIVE)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR) +libbluray: $(LIBBLURAY_DEPS) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBBLURAY_TMP) $(UNTAR)/$(LIBBLURAY_SOURCE) $(CHDIR)/$(LIBBLURAY_TMP); \ @@ -691,14 +691,14 @@ LIBASS_TMP = libass-$(LIBASS_VER) LIBASS_SOURCE = libass-$(LIBASS_VER).tar.xz LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VER) -$(ARCHIVE)/$(LIBASS_SOURCE): +$(DL_DIR)/$(LIBASS_SOURCE): $(DOWNLOAD) $(LIBASS_SITE)/$(LIBASS_SOURCE) LIBASS_PATCH = libass.patch LIBASS_DEPS = freetype fribidi -libass: $(LIBASS_DEPS) $(ARCHIVE)/$(LIBASS_SOURCE) | $(TARGET_DIR) +libass: $(LIBASS_DEPS) $(DL_DIR)/$(LIBASS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBASS_TMP) $(UNTAR)/$(LIBASS_SOURCE) $(CHDIR)/$(LIBASS_TMP); \ @@ -726,10 +726,10 @@ LIBGPG-ERROR_TMP = 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 -$(ARCHIVE)/$(LIBGPG-ERROR_SOURCE): +$(DL_DIR)/$(LIBGPG-ERROR_SOURCE): $(DOWNLOAD) $(LIBGPG-ERROR_SITE)/$(LIBGPG-ERROR_SOURCE) -libgpg-error: $(ARCHIVE)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR) +libgpg-error: $(DL_DIR)/$(LIBGPG-ERROR_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBGPG-ERROR_TMP) $(UNTAR)/$(LIBGPG-ERROR_SOURCE) $(CHDIR)/$(LIBGPG-ERROR_TMP); \ @@ -764,12 +764,12 @@ LIBGCRYPT_TMP = libgcrypt-$(LIBGCRYPT_VER) LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VER).tar.gz LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt -$(ARCHIVE)/$(LIBGCRYPT_SOURCE): +$(DL_DIR)/$(LIBGCRYPT_SOURCE): $(DOWNLOAD) $(LIBGCRYPT_SITE)/$(LIBGCRYPT_SOURCE) LIBGCRYPT_DEPS = libgpg-error -libgcrypt: $(LIBGCRYPT_DEPS) $(ARCHIVE)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR) +libgcrypt: $(LIBGCRYPT_DEPS) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBGCRYPT_TMP) $(UNTAR)/$(LIBGCRYPT_SOURCE) $(CHDIR)/$(LIBGCRYPT_TMP); \ @@ -800,12 +800,12 @@ LIBAACS_TMP = libaacs-$(LIBAACS_VER) LIBAACS_SOURCE = libaacs-$(LIBAACS_VER).tar.bz2 LIBAACS_SITE = ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VER) -$(ARCHIVE)/$(LIBAACS_SOURCE): +$(DL_DIR)/$(LIBAACS_SOURCE): $(DOWNLOAD) $(LIBAACS_SITE)/$(LIBAACS_SOURCE) LIBAACS_DEPS = libgcrypt -libaacs: $(LIBAACS_DEPS) $(ARCHIVE)/$(LIBAACS_SOURCE) | $(TARGET_DIR) +libaacs: $(LIBAACS_DEPS) $(DL_DIR)/$(LIBAACS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBAACS_TMP) $(UNTAR)/$(LIBAACS_SOURCE) $(CHDIR)/$(LIBAACS_TMP); \ @@ -834,12 +834,12 @@ LIBBDPLUS_TMP = libbdplus-$(LIBBDPLUS_VER) LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VER).tar.bz2 LIBBDPLUS_SITE = ftp://ftp.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VER) -$(ARCHIVE)/$(LIBBDPLUS_SOURCE): +$(DL_DIR)/$(LIBBDPLUS_SOURCE): $(DOWNLOAD) $(LIBBDPLUS_SITE)/$(LIBBDPLUS_SOURCE) LIBBDPLUS_DEPS = libaacs -libbdplus: $(LIBBDPLUS_DEPS) $(ARCHIVE)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR) +libbdplus: $(LIBBDPLUS_DEPS) $(DL_DIR)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBBDPLUS_TMP) $(UNTAR)/$(LIBBDPLUS_SOURCE) $(CHDIR)/$(LIBBDPLUS_TMP); \ @@ -868,10 +868,10 @@ LIBXML2_TMP = libxml2-$(LIBXML2_VER) LIBXML2_SOURCE = libxml2-$(LIBXML2_VER).tar.gz LIBXML2_SITE = http://xmlsoft.org/sources -$(ARCHIVE)/$(LIBXML2_SOURCE): +$(DL_DIR)/$(LIBXML2_SOURCE): $(DOWNLOAD) $(LIBXML2_SITE)/$(LIBXML2_SOURCE) -libxml2: $(ARCHIVE)/$(LIBXML2_SOURCE) | $(TARGET_DIR) +libxml2: $(DL_DIR)/$(LIBXML2_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBXML2_TMP) $(UNTAR)/$(LIBXML2_SOURCE) $(CHDIR)/$(LIBXML2_TMP); \ @@ -909,12 +909,12 @@ PUGIXML_TMP = pugixml-$(PUGIXML_VER) PUGIXML_SOURCE = pugixml-$(PUGIXML_VER).tar.gz PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VER) -$(ARCHIVE)/$(PUGIXML_SOURCE): +$(DL_DIR)/$(PUGIXML_SOURCE): $(DOWNLOAD) $(PUGIXML_SITE)/$(PUGIXML_SOURCE) PUGIXML_PATCH = pugixml-config.patch -pugixml: $(ARCHIVE)/$(PUGIXML_SOURCE) | $(TARGET_DIR) +pugixml: $(DL_DIR)/$(PUGIXML_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PUGIXML_TMP) $(UNTAR)/$(PUGIXML_SOURCE) $(CHDIR)/$(PUGIXML_TMP); \ @@ -933,10 +933,10 @@ LIBROXML_TMP = libroxml-$(LIBROXML_VER) LIBROXML_SOURCE = libroxml-$(LIBROXML_VER).tar.gz LIBROXML_SITE = http://download.libroxml.net/pool/v3.x -$(ARCHIVE)/$(LIBROXML_SOURCE): +$(DL_DIR)/$(LIBROXML_SOURCE): $(DOWNLOAD) $(LIBROXML_SITE)/$(LIBROXML_SOURCE) -libroxml: $(ARCHIVE)/$(LIBROXML_SOURCE) | $(TARGET_DIR) +libroxml: $(DL_DIR)/$(LIBROXML_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBROXML_TMP) $(UNTAR)/$(LIBROXML_SOURCE) $(CHDIR)/$(LIBROXML_TMP); \ @@ -979,14 +979,14 @@ LIBTIRPC_TMP = libtirpc-$(LIBTIRPC_VER) LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VER).tar.bz2 LIBTIRPC_SITE = https://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VER) -$(ARCHIVE)/$(LIBTIRPC_SOURCE): +$(DL_DIR)/$(LIBTIRPC_SOURCE): $(DOWNLOAD) $(LIBTIRPC_SITE)/$(LIBTIRPC_SOURCE) LIBTIRP_PATCH = 0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch 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: $(ARCHIVE)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) +libtirpc: $(DL_DIR)/$(LIBTIRPC_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBTIRPC_TMP) $(UNTAR)/$(LIBTIRPC_SOURCE) $(CHDIR)/$(LIBTIRPC_TMP); \ @@ -1013,10 +1013,10 @@ CONFUSE_TMP = confuse-$(CONFUSE_VER) CONFUSE_SOURCE = confuse-$(CONFUSE_VER).tar.xz CONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(CONFUSE_VER) -$(ARCHIVE)/$(CONFUSE_SOURCE): +$(DL_DIR)/$(CONFUSE_SOURCE): $(DOWNLOAD) $(CONFUSE_SITE)/$(CONFUSE_SOURCE) -confuse: $(ARCHIVE)/$(CONFUSE_SOURCE) | $(TARGET_DIR) +confuse: $(DL_DIR)/$(CONFUSE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(CONFUSE_TMP) $(UNTAR)/$(CONFUSE_SOURCE) $(CHDIR)/$(CONFUSE_TMP); \ @@ -1041,10 +1041,10 @@ LIBITE_TMP = libite-$(LIBITE_VER) LIBITE_SOURCE = libite-$(LIBITE_VER).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VER) -$(ARCHIVE)/$(LIBITE_SOURCE): +$(DL_DIR)/$(LIBITE_SOURCE): $(DOWNLOAD) $(LIBITE_SITE)/$(LIBITE_SOURCE) -libite: $(ARCHIVE)/$(LIBITE_SOURCE) | $(TARGET_DIR) +libite: $(DL_DIR)/$(LIBITE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBITE_TMP) $(UNTAR)/$(LIBITE_SOURCE) $(CHDIR)/$(LIBITE_TMP); \ @@ -1069,7 +1069,7 @@ LIBMAD_TMP = libmad-$(LIBMAD_VER) LIBMAD_SOURCE = libmad-$(LIBMAD_VER).tar.gz LIBMAD_SITE = https://sourceforge.net/projects/mad/files/libmad/$(LIBMAD_VER) -$(ARCHIVE)/$(LIBMAD_SOURCE): +$(DL_DIR)/$(LIBMAD_SOURCE): $(DOWNLOAD) $(LIBMAD_SITE)/$(LIBMAD_SOURCE) LIBMAD_PATCH = libmad-pc.patch @@ -1079,7 +1079,7 @@ LIBMAD_PATCH += libmad-remove-deprecated-cflags.patch LIBMAD_PATCH += libmad-thumb2-fixed-arm.patch LIBMAD_PATCH += libmad-thumb2-imdct-arm.patch -libmad: $(ARCHIVE)/$(LIBMAD_SOURCE) | $(TARGET_DIR) +libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBMAD_TMP) $(UNTAR)/$(LIBMAD_SOURCE) $(CHDIR)/$(LIBMAD_TMP); \ @@ -1106,12 +1106,12 @@ LIBVORBISIDEC_TMP = libvorbisidec-$(LIBVORBISIDEC_VER) LIBVORBISIDEC_SOURCE = libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz LIBVORBISIDEC_SITE = https://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec -$(ARCHIVE)/$(LIBVORBISIDEC_SOURCE): +$(DL_DIR)/$(LIBVORBISIDEC_SOURCE): $(DOWNLOAD) $(LIBVORBISIDEC_SITE)/$(LIBVORBISIDEC_SOURCE) LIBVORBISIDEC_DEPS = libogg -libvorbisidec: $(LIBVORBISIDEC_DEPS) $(ARCHIVE)/$(LIBVORBISIDEC_SOURCE) | $(TARGET_DIR) +libvorbisidec: $(LIBVORBISIDEC_DEPS) $(DL_DIR)/$(LIBVORBISIDEC_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBVORBISIDEC_TMP) $(UNTAR)/$(LIBVORBISIDEC_SOURCE) $(CHDIR)/$(LIBVORBISIDEC_TMP); \ @@ -1134,10 +1134,10 @@ LIBOGG_TMP = libogg-$(LIBOGG_VER) LIBOGG_SOURCE = libogg-$(LIBOGG_VER).tar.gz LIBOGG_SITE = https://ftp.osuosl.org/pub/xiph/releases/ogg -$(ARCHIVE)/$(LIBOGG_SOURCE): +$(DL_DIR)/$(LIBOGG_SOURCE): $(DOWNLOAD) $(LIBOGG_SITE)/$(LIBOGG_SOURCE) -libogg: $(ARCHIVE)/$(LIBOGG_SOURCE) | $(TARGET_DIR) +libogg: $(DL_DIR)/$(LIBOGG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBOGG_TMP) $(UNTAR)/$(LIBOGG_SOURCE) $(CHDIR)/$(LIBOGG_TMP); \ @@ -1160,10 +1160,10 @@ FRIBIDI_TMP = fribidi-$(FRIBIDI_VER) FRIBIDI_SOURCE = fribidi-$(FRIBIDI_VER).tar.xz FRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VER) -$(ARCHIVE)/$(FRIBIDI_SOURCE): +$(DL_DIR)/$(FRIBIDI_SOURCE): $(DOWNLOAD) $(FRIBIDI_SITE)/$(FRIBIDI_SOURCE) -fribidi: $(ARCHIVE)/$(FRIBIDI_SOURCE) | $(TARGET_DIR) +fribidi: $(DL_DIR)/$(FRIBIDI_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FRIBIDI_TMP) $(UNTAR)/$(FRIBIDI_SOURCE) $(CHDIR)/$(FRIBIDI_TMP); \ @@ -1187,14 +1187,14 @@ LIBFFI_TMP = libffi-$(LIBFFI_VER) LIBFFI_SOURCE = libffi-$(LIBFFI_VER).tar.gz LIBFFI_SITE = ftp://sourceware.org/pub/libffi -$(ARCHIVE)/$(LIBFFI_SOURCE): +$(DL_DIR)/$(LIBFFI_SOURCE): $(DOWNLOAD) $(LIBFFI_SITE)/$(LIBFFI_SOURCE) LIBFFI_PATCH = libffi-install_headers.patch LIBFFI_CONF = $(if $(filter $(BOXSERIES), hd1),--enable-static --disable-shared) -libffi: $(ARCHIVE)/$(LIBFFI_SOURCE) | $(TARGET_DIR) +libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBFFI_TMP) $(UNTAR)/$(LIBFFI_SOURCE) $(CHDIR)/$(LIBFFI_TMP); \ @@ -1218,7 +1218,7 @@ GLIB2_TMP = glib-$(GLIB2_VER) GLIB2_SOURCE = glib-$(GLIB2_VER).tar.xz GLIB2_SITE = https://ftp.gnome.org/pub/gnome/sources/glib/$(basename $(GLIB2_VER)) -$(ARCHIVE)/$(GLIB2_SOURCE): +$(DL_DIR)/$(GLIB2_SOURCE): $(DOWNLOAD) $(GLIB2_SITE)/$(GLIB2_SOURCE) GLIB2_PATCH = glib2-disable-tests.patch @@ -1236,7 +1236,7 @@ ifeq ($(BOXSERIES), $(filter $(BOXSERIES), vusolo4k vuduo4k vuduo4kse vuultimo4k GLIB2_CONF += --with-libiconv=gnu endif -glib2: $(GLIB2_DEPS) $(ARCHIVE)/$(GLIB2_SOURCE) | $(TARGET_DIR) +glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(GLIB2_TMP) $(UNTAR)/$(GLIB2_SOURCE) $(CHDIR)/$(GLIB2_TMP); \ @@ -1278,10 +1278,10 @@ ALSA-LIB_TMP = 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 -$(ARCHIVE)/$(ALSA-LIB_SOURCE): +$(DL_DIR)/$(ALSA-LIB_SOURCE): $(DOWNLOAD) $(ALSA-LIB_SITE)/$(ALSA-LIB_SOURCE) -alsa-lib: $(ARCHIVE)/$(ALSA-LIB_SOURCE) +alsa-lib: $(DL_DIR)/$(ALSA-LIB_SOURCE) $(REMOVE)/$(ALSA-LIB_TMP) $(UNTAR)/$(ALSA-LIB_SOURCE) $(CHDIR)/$(ALSA-LIB_TMP); \ @@ -1319,10 +1319,10 @@ POPT_TMP = popt-$(POPT_VER) POPT_SOURCE = popt-$(POPT_VER).tar.gz POPT_SITE = ftp://anduin.linuxfromscratch.org/BLFS/popt -$(ARCHIVE)/$(POPT_SOURCE): +$(DL_DIR)/$(POPT_SOURCE): $(DOWNLOAD) $(POPT_SITE)/$(POPT_SOURCE) -popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR) +popt: $(DL_DIR)/$(POPT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(POPT_TMP) $(UNTAR)/$(POPT_SOURCE) $(CHDIR)/$(POPT_TMP); \ @@ -1344,10 +1344,10 @@ LIBICONV_TMP = libiconv-$(LIBICONV_VER) LIBICONV_SOURCE = libiconv-$(LIBICONV_VER).tar.gz LIBICONV_SITE = https://ftp.gnu.org/gnu/libiconv -$(ARCHIVE)/$(LIBICONV_SOURCE): +$(DL_DIR)/$(LIBICONV_SOURCE): $(DOWNLOAD) $(LIBICONV_SITE)/$(LIBICONV_SOURCE) -libiconv: $(ARCHIVE)/$(LIBICONV_SOURCE) | $(TARGET_DIR) +libiconv: $(DL_DIR)/$(LIBICONV_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LIBICONV_TMP) $(UNTAR)/$(LIBICONV_SOURCE) $(CHDIR)/$(LIBICONV_TMP); \ @@ -1391,7 +1391,7 @@ GRAPHLCD_BASE_MAKE_OPTS = \ graphlcd-base: $(GRAPHLCD_BASE_DEPS) | $(TARGET_DIR) $(REMOVE)/$(GRAPHLCD_BASE_TMP) - $(GET-GIT-SOURCE) $(GRAPHLCD_BASE_SITE)/$(GRAPHLCD_BASE_SOURCE) $(ARCHIVE)/$(GRAPHLCD_BASE_SOURCE) + $(GET-GIT-SOURCE) $(GRAPHLCD_BASE_SITE)/$(GRAPHLCD_BASE_SOURCE) $(DL_DIR)/$(GRAPHLCD_BASE_SOURCE) $(CPDIR)/$(GRAPHLCD_BASE_TMP) $(CHDIR)/$(GRAPHLCD_BASE_TMP); \ $(call apply_patches, $(addprefix $(@)/,$(GRAPHLCD_BASE_PATCH))); \ diff --git a/make/target-lua.mk b/make/target-lua.mk index a0f7ebd6..ea23311d 100644 --- a/make/target-lua.mk +++ b/make/target-lua.mk @@ -9,7 +9,7 @@ LUA_TMP = lua-$(LUA_VER) LUA_SOURCE = lua-$(LUA_VER).tar.gz LUA_SITE = https://www.lua.org -$(ARCHIVE)/$(LUA_SOURCE): +$(DL_DIR)/$(LUA_SOURCE): $(DOWNLOAD) $(LUA_SITE)/ftp/$(LUA_SOURCE) LUA_PATCH = lua-01-fix-LUA_ROOT.patch @@ -20,7 +20,7 @@ LUA_PATCH += lua-04-crashfix.diff LUA_DEPS = ncurses -lua: $(LUA_DEPS) $(ARCHIVE)/$(LUA_SOURCE) | $(TARGET_DIR) +lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LUA_TMP) $(UNTAR)/$(LUA_SOURCE) $(CHDIR)/$(LUA_TMP); \ @@ -45,12 +45,12 @@ LUAEXPAT_TMP = luaexpat-$(LUAEXPAT_VER) LUAEXPAT_SOURCE = luaexpat-$(LUAEXPAT_VER).tar.gz LUAEXPAT_SITE = https://github.com/tomasguisasola/luaexpat/archive -$(ARCHIVE)/$(LUAEXPAT_SOURCE): +$(DL_DIR)/$(LUAEXPAT_SOURCE): $(DOWNLOAD) $(LUAEXPAT_SITE)/v$(LUAEXPAT_VER).tar.gz -O $(@) LUAEXPAT_DEPS = expat lua -luaexpat: $(LUAEXPAT_DEPS) $(ARCHIVE)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR) +luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LUAEXPAT_TMP) $(UNTAR)/$(LUAEXPAT_SOURCE) $(CHDIR)/$(LUAEXPAT_TMP); \ @@ -74,14 +74,14 @@ LUA-FEEDPARSER_TMP = 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 -$(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE): +$(DL_DIR)/$(LUA-FEEDPARSER_SOURCE): $(DOWNLOAD) $(LUA-FEEDPARSER_SITE)/$(LUA-FEEDPARSER_VER).tar.gz -O $(@) LUA-FEEDPARSER_PATCH = lua-feedparser.patch LUA-DEEDPARSER_DEPS = luaexpat -lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR) +lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA-FEEDPARSER_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LUA-FEEDPARSER_TMP) $(UNTAR)/$(LUA-FEEDPARSER_SOURCE) $(CHDIR)/$(LUA-FEEDPARSER_TMP); \ @@ -96,13 +96,13 @@ lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(ARCHIVE)/$(LUA-FEEDPARSER_SOURCE) | $(T LUAJSON_SOURCE = JSON.lua LUAJSON_SITE = http://regex.info/code -$(ARCHIVE)/$(LUAJSON_SOURCE): +$(DL_DIR)/$(LUAJSON_SOURCE): $(DOWNLOAD) $(LUAJSON_SITE)/$(LUAJSON_SOURCE) -luajson: $(ARCHIVE)/$(LUAJSON_SOURCE) | $(TARGET_DIR) - $(CD) $(ARCHIVE); \ +luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR) + $(CD) $(DL_DIR); \ curl --remote-name --time-cond $(LUAJSON_SOURCE) $(LUAJSON_SITE)/$(LUAJSON_SOURCE) || true - $(INSTALL_DATA) -D $(ARCHIVE)/$(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER) + $(INSTALL_DATA) -D $(DL_DIR)/$(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER) ln -sf $(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)/json.lua $(TOUCH) @@ -117,7 +117,7 @@ LUACURL_DEPS = libcurl lua luacurl: $(LUACURL_DEPS) | $(TARGET_DIR) $(REMOVE)/$(LUACURL_TMP) - $(GET-GIT-SOURCE) $(LUACURL_SITE) $(ARCHIVE)/$(LUACURL_SOURCE) + $(GET-GIT-SOURCE) $(LUACURL_SITE) $(DL_DIR)/$(LUACURL_SOURCE) $(CPDIR)/$(LUACURL_SOURCE) $(CHDIR)/$(LUACURL_TMP); \ $(MAKE_ENV) \ @@ -137,7 +137,7 @@ LUAPOSIX_TMP = luaposix-$(LUAPOSIX_VER) LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VER).tar.gz LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive -$(ARCHIVE)/$(LUAPOSIX_SOURCE): +$(DL_DIR)/$(LUAPOSIX_SOURCE): $(DOWNLOAD) $(LUAPOSIX_SITE)/v$(LUAPOSIX_VER).tar.gz -O $(@) LUAPOSIX_PATCH = luaposix-fix-build.patch @@ -149,22 +149,22 @@ GNULIB_VER = 20140202 GNULIB_SOURCE = gnulib-$(GNULIB_VER)-stable.tar.gz GNULIB_SITE = http://erislabs.net/ianb/projects/gnulib -$(ARCHIVE)/$(GNULIB_SOURCE): +$(DL_DIR)/$(GNULIB_SOURCE): $(DOWNLOAD) $(GNULIB_SITE)/$(GNULIB_SOURCE) SLINGSHOT_VER = 6 SLINGSHOT_SOURCE = slingshot-$(SLINGSHOT_VER).tar.gz SLINGSHOT_SITE = https://github.com/gvvaughan/slingshot/archive -$(ARCHIVE)/$(SLINGSHOT_SOURCE): +$(DL_DIR)/$(SLINGSHOT_SOURCE): $(DOWNLOAD) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VER).tar.gz -O $(@) -luaposix: $(LUAPOSIX_DEPS) $(ARCHIVE)/$(SLINGSHOT_SOURCE) $(ARCHIVE)/$(GNULIB_SOURCE) $(ARCHIVE)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR) +luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOURCE) $(DL_DIR)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LUAPOSIX_TMP) $(UNTAR)/$(LUAPOSIX_SOURCE) $(CHDIR)/$(LUAPOSIX_TMP); \ - tar -C gnulib --strip=1 -xf $(ARCHIVE)/$(GNULIB_SOURCE); \ - tar -C slingshot --strip=1 -xf $(ARCHIVE)/$(SLINGSHOT_SOURCE); \ + 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)); \ export LUA=$(HOST_LUA); \ ./bootstrap; \ diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk index fd0e9a70..bffa4162 100644 --- a/make/target-tools-unused.mk +++ b/make/target-tools-unused.mk @@ -9,7 +9,7 @@ USBUTILS_TMP = usbutils-$(USBUTILS_VER) USBUTILS_SOURCE = usbutils-$(USBUTILS_VER).tar.xz USBUTILS_SITE = https://www.kernel.org/pub/linux/utils/usb/usbutils -$(ARCHIVE)/$(USBUTILS_SOURCE): +$(DL_DIR)/$(USBUTILS_SOURCE): $(DOWNLOAD) $(USBUTILS_SITE)/$(USBUTILS_SOURCE) USBUTILS_PATCH = usbutils-avoid-dependency-on-bash.patch @@ -17,7 +17,7 @@ USBUTILS_PATCH += usbutils-fix-null-pointer-crash.patch USBUTILS_DEPS = libusb-compat -usbutils: $(USBUTILS_DEPS) $(ARCHIVE)/$(USBUTILS_SOURCE) | $(TARGET_DIR) +usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(USBUTILS_TMP) $(UNTAR)/$(USBUTILS_SOURCE) $(CHDIR)/$(USBUTILS_TMP); \ @@ -45,12 +45,12 @@ BINUTILS_TMP = binutils-$(BINUTILS_VER) BINUTILS_SOURCE = binutils-$(BINUTILS_VER).tar.bz2 BINUTILS_SITE = https://ftp.gnu.org/gnu/binutils -$(ARCHIVE)/$(BINUTILS_SOURCE): +$(DL_DIR)/$(BINUTILS_SOURCE): $(DOWNLOAD) $(BINUTILS_SITE)/$(BINUTILS_SOURCE) BINUTILS_BIN = objdump objcopy -binutils: $(ARCHIVE)/$(BINUTILS_SOURCE) | $(TARGET_DIR) +binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BINUTILS_TMP) $(UNTAR)/$(BINUTILS_SOURCE) $(CHDIR)/$(BINUTILS_TMP); \ @@ -78,12 +78,12 @@ UTIL-LINUX_TMP = 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) -$(ARCHIVE)/$(UTIL-LINUX_SOURCE): +$(DL_DIR)/$(UTIL-LINUX_SOURCE): $(DOWNLOAD) $(UTIL-LINUX_SITE)/$(UTIL-LINUX_SOURCE) UTUL-LINUX_DEPS = ncurses zlib -util-linux: $(UTUL-LINUX_DEPS) $(ARCHIVE)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR) +util-linux: $(UTUL-LINUX_DEPS) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(UTIL-LINUX_TMP) $(UNTAR)/$(UTIL-LINUX_SOURCE) $(CHDIR)/$(UTIL-LINUX_TMP); \ @@ -133,7 +133,7 @@ ASTRA-SM_DEPS = openssl astra-sm: TARGET_ABI="" astra-sm: $(ASTRA-SM_DEPS) | $(TARGET_DIR) $(REMOVE)/$(ASTRA-SM_TMP) - $(GET-GIT-SOURCE) $(ASTRA-SM_SITE)/$(ASTRA-SM_SOURCE) $(ARCHIVE)/$(ASTRA-SM_SOURCE) + $(GET-GIT-SOURCE) $(ASTRA-SM_SITE)/$(ASTRA-SM_SOURCE) $(DL_DIR)/$(ASTRA-SM_SOURCE) $(CPDIR)/$(ASTRA-SM_SOURCE) $(CHDIR)/$(ASTRA-SM_TMP); \ autoreconf -fi; \ @@ -152,10 +152,10 @@ IOZONE_TMP = iozone$(IOZONE_VER) IOZONE_SOURCE = iozone$(IOZONE_VER).tar IOZONE_SITE = http://www.iozone.org/src/current -$(ARCHIVE)/$(IOZONE_SOURCE): +$(DL_DIR)/$(IOZONE_SOURCE): $(DOWNLOAD) $(IOZONE_SITE)/$(IOZONE_SOURCE) -iozone: $(ARCHIVE)/$(IOZONE_SOURCE) | $(TARGET_DIR) +iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(IOZONE_TMP) $(UNTAR)/$(IOZONE_SOURCE) $(CHDIR)/$(IOZONE_TMP)/src/current; \ @@ -174,10 +174,10 @@ READLINE_TMP = readline-$(READLINE_VER) READLINE_SOURCE = readline-$(READLINE_VER).tar.gz READLINE_SITE = https://ftp.gnu.org/gnu/readline -$(ARCHIVE)/$(READLINE_SOURCE): +$(DL_DIR)/$(READLINE_SOURCE): $(DOWNLOAD) $(READLINE_SITE)/$(READLINE_SOURCE) -readline: $(ARCHIVE)/$(READLINE_SOURCE) | $(TARGET_DIR) +readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(READLINE_TMP) $(UNTAR)/$(READLINE_SOURCE) $(CHDIR)/$(READLINE_TMP); \ diff --git a/make/target-tools.mk b/make/target-tools.mk index 80b77775..173b40e7 100644 --- a/make/target-tools.mk +++ b/make/target-tools.mk @@ -8,7 +8,7 @@ BUSYBOX_TMP = busybox-$(BUSYBOX_VER) BUSYBOX_SOURCE = busybox-$(BUSYBOX_VER).tar.bz2 BUSYBOX_SITE = https://busybox.net/downloads -$(ARCHIVE)/$(BUSYBOX_SOURCE): +$(DL_DIR)/$(BUSYBOX_SOURCE): $(DOWNLOAD) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE) BUSYBOX_PATCH = busybox-fix-config-header.diff @@ -109,7 +109,7 @@ define BUSYBOX_ADD_TO_SHELLS fi endef -busybox: $(BUSYBOX_DEPS) $(ARCHIVE)/$(BUSYBOX_SOURCE) | $(TARGET_DIR) +busybox: $(BUSYBOX_DEPS) $(DL_DIR)/$(BUSYBOX_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BUSYBOX_TMP) $(UNTAR)/$(BUSYBOX_SOURCE) $(CHDIR)/$(BUSYBOX_TMP); \ @@ -130,12 +130,12 @@ OPENVPN_TMP = openvpn-$(OPENVPN_VER) OPENVPN_SOURCE = openvpn-$(OPENVPN_VER).tar.xz OPENVPN_SITE = http://build.openvpn.net/downloads/releases -$(ARCHIVE)/$(OPENVPN_SOURCE): +$(DL_DIR)/$(OPENVPN_SOURCE): $(DOWNLOAD) $(OPENVPN_SITE)/$(OPENVPN_SOURCE) OPENVPN_DEPS = lzo openssl -openvpn: $(OPENVPN_DEPS) $(ARCHIVE)/$(OPENVPN_SOURCE) | $(TARGET_DIR) +openvpn: $(OPENVPN_DEPS) $(DL_DIR)/$(OPENVPN_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(OPENVPN_TMP) $(UNTAR)/$(OPENVPN_SOURCE) $(CHDIR)/$(OPENVPN_TMP); \ @@ -169,12 +169,12 @@ OPENSSH_TMP = openssh-$(OPENSSH_VER) OPENSSH_SOURCE = openssh-$(OPENSSH_VER).tar.gz OPENSSH_SITE = https://artfiles.org/openbsd/OpenSSH/portable -$(ARCHIVE)/$(OPENSSH_SOURCE): +$(DL_DIR)/$(OPENSSH_SOURCE): $(DOWNLOAD) $(OPENSSH_SITE)/$(OPENSSH_SOURCE) OPENSSH_DEPS = openssl zlib -openssh: $(OPENSSH_DEPS) $(ARCHIVE)/$(OPENSSH_SOURCE) | $(TARGET_DIR) +openssh: $(OPENSSH_DEPS) $(DL_DIR)/$(OPENSSH_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(OPENSSH_TMP) $(UNTAR)/$(OPENSSH_SOURCE) $(CHDIR)/$(OPENSSH_TMP); \ @@ -211,7 +211,7 @@ TZDATA_TMP = tzdata$(TZDATA_VER) TZDATA_SOURCE = tzdata$(TZDATA_VER).tar.gz TZDATA_SITE = ftp://ftp.iana.org/tz/releases -$(ARCHIVE)/$(TZDATA_SOURCE): +$(DL_DIR)/$(TZDATA_SOURCE): $(DOWNLOAD) $(TZDATA_SITE)/$(TZDATA_SOURCE) TZDATA_DEPS = $(HOST_ZIC) @@ -222,11 +222,11 @@ TZDATA_ZONELIST = \ ETC_LOCALTIME = $(if $(filter $(PERSISTENT_VAR_PARTITION), yes),/var/etc/localtime,/etc/localtime) -tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR) +tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(TZDATA_TMP) $(MKDIR)/$(TZDATA_TMP) $(CHDIR)/$(TZDATA_TMP); \ - tar -xf $(ARCHIVE)/$(TZDATA_SOURCE); \ + tar -xf $(DL_DIR)/$(TZDATA_SOURCE); \ unset ${!LC_*}; LANG=POSIX; LC_ALL=POSIX; export LANG LC_ALL; \ $(HOST_ZIC) -d zoneinfo.tmp $(TZDATA_ZONELIST); \ mkdir zoneinfo; \ @@ -253,12 +253,12 @@ MTD-UTILS_TMP = 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 -$(ARCHIVE)/$(MTD-UTILS_SOURCE): +$(DL_DIR)/$(MTD-UTILS_SOURCE): $(DOWNLOAD) $(MTD-UTILS_SITE)/$(MTD-UTILS_SOURCE) MTD-UTILS_DEPS = zlib lzo e2fsprogs -mtd-utils: $(MTD-UTILS_DEPS) $(ARCHIVE)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR) +mtd-utils: $(MTD-UTILS_DEPS) $(DL_DIR)/$(MTD-UTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(MTD-UTILS_TMP) $(UNTAR)/$(MTD-UTILS_SOURCE) $(CHDIR)/$(MTD-UTILS_TMP); \ @@ -289,12 +289,12 @@ IPERF_TMP = iperf-$(IPERF_VER) IPERF_SOURCE = iperf-$(IPERF_VER)-source.tar.gz IPERF_SITE = https://iperf.fr/download/source -$(ARCHIVE)/$(IPERF_SOURCE): +$(DL_DIR)/$(IPERF_SOURCE): $(DOWNLOAD) $(IPERF_SITE)/$(IPERF_SOURCE) IPERF_PATCH = iperf-disable-profiling.patch -iperf: $(ARCHIVE)/$(IPERF_SOURCE) | $(TARGET_DIR) +iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(IPERF_TMP) $(UNTAR)/$(IPERF_SOURCE) $(CHDIR)/$(IPERF_TMP); \ @@ -316,7 +316,7 @@ PARTED_TMP = parted-$(PARTED_VER) PARTED_SOURCE = parted-$(PARTED_VER).tar.xz PARTED_SITE = https://ftp.gnu.org/gnu/parted -$(ARCHIVE)/$(PARTED_SOURCE): +$(DL_DIR)/$(PARTED_SOURCE): $(DOWNLOAD) $(PARTED_SITE)/$(PARTED_SOURCE) PARTED_PATCH = parted-device-mapper.patch @@ -325,7 +325,7 @@ PARTED_PATCH += parted-iconv.patch PARTED_DEPS = e2fsprogs -parted: $(PARTED_DEPS) $(ARCHIVE)/$(PARTED_SOURCE) | $(TARGET_DIR) +parted: $(PARTED_DEPS) $(DL_DIR)/$(PARTED_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PARTED_TMP) $(UNTAR)/$(PARTED_SOURCE) $(CHDIR)/$(PARTED_TMP); \ @@ -359,10 +359,10 @@ HDPARM_TMP = hdparm-$(HDPARM_VER) HDPARM_SOURCE = hdparm-$(HDPARM_VER).tar.gz HDPARM_SITE = https://sourceforge.net/projects/hdparm/files/hdparm -$(ARCHIVE)/$(HDPARM_SOURCE): +$(DL_DIR)/$(HDPARM_SOURCE): $(DOWNLOAD) $(HDPARM_SITE)/$(HDPARM_SOURCE) -hdparm: $(ARCHIVE)/$(HDPARM_SOURCE) | $(TARGET_DIR) +hdparm: $(DL_DIR)/$(HDPARM_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(HDPARM_TMP) $(UNTAR)/$(HDPARM_SOURCE) $(CHDIR)/$(HDPARM_TMP); \ @@ -379,10 +379,10 @@ HD-IDLE_TMP = hd-idle HD-IDLE_SOURCE = hd-idle-$(HD-IDLE_VER).tgz HD-IDLE_SITE = https://sourceforge.net/projects/hd-idle/files -$(ARCHIVE)/$(HD-IDLE_SOURCE): +$(DL_DIR)/$(HD-IDLE_SOURCE): $(DOWNLOAD) $(HD-IDLE_SITE)/$(HD-IDLE_SOURCE) -hd-idle: $(ARCHIVE)/$(HD-IDLE_SOURCE) | $(TARGET_DIR) +hd-idle: $(DL_DIR)/$(HD-IDLE_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(HD-IDLE_TMP) $(UNTAR)/$(HD-IDLE_SOURCE) $(CHDIR)/$(HD-IDLE_TMP); \ @@ -399,14 +399,14 @@ COREUTILS_TMP = coreutils-$(COREUTILS_VER) COREUTILS_SOURCE = coreutils-$(COREUTILS_VER).tar.xz COREUTILS_SITE = https://ftp.gnu.org/gnu/coreutils -$(ARCHIVE)/$(COREUTILS_SOURCE): +$(DL_DIR)/$(COREUTILS_SOURCE): $(DOWNLOAD) $(COREUTILS_SITE)/$(COREUTILS_SOURCE) COREUTILS_PATCH = coreutils-fix-build.patch COREUTILS_BIN = touch -coreutils: $(ARCHIVE)/$(COREUTILS_SOURCE) | $(TARGET_DIR) +coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(COREUTILS_TMP) $(UNTAR)/$(COREUTILS_SOURCE) $(CHDIR)/$(COREUTILS_TMP); \ @@ -442,12 +442,12 @@ LESS_TMP = less-$(LESS_VER) LESS_SOURCE = less-$(LESS_VER).tar.gz LESS_SITE = http://www.greenwoodsoftware.com/less -$(ARCHIVE)/$(LESS_SOURCE): +$(DL_DIR)/$(LESS_SOURCE): $(DOWNLOAD) $(LESS_SITE)/$(LESS_SOURCE) LESS_DEPS = ncurses -less: $(LESS_DEPS) $(ARCHIVE)/$(LESS_SOURCE) | $(TARGET_DIR) +less: $(LESS_DEPS) $(DL_DIR)/$(LESS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(LESS_TMP) $(UNTAR)/$(LESS_SOURCE) $(CHDIR)/$(LESS_TMP); \ @@ -468,12 +468,12 @@ NTP_TMP = 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)) -$(ARCHIVE)/$(NTP_SOURCE): +$(DL_DIR)/$(NTP_SOURCE): $(DOWNLOAD) $(NTP_SITE)/$(NTP_SOURCE) NTP_DEPS = openssl -ntp: $(NTP_DEPS) $(ARCHIVE)/$(NTP_SOURCE) | $(TARGET_DIR) +ntp: $(NTP_DEPS) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(NTP_TMP) $(UNTAR)/$(NTP_SOURCE) $(CHDIR)/$(NTP_TMP); \ @@ -500,7 +500,7 @@ DJMOUNT_TMP = djmount-$(DJMOUNT_VER) DJMOUNT_SOURCE = djmount-$(DJMOUNT_VER).tar.gz DJMOUNT_SITE = https://sourceforge.net/projects/djmount/files/djmount/$(DJMOUNT_VER) -$(ARCHIVE)/$(DJMOUNT_SOURCE): +$(DL_DIR)/$(DJMOUNT_SOURCE): $(DOWNLOAD) $(DJMOUNT_SITE)/$(DJMOUNT_SOURCE) DJMOUNT_PATCH = djmount-fix-hang-with-asset-upnp.patch @@ -514,7 +514,7 @@ DJMOUNT_PATCH += djmount-support-seeking-in-large-2gb-files.patch DJMOUNT_DEPS = libfuse -djmount: $(DJMOUNT_DEPS) $(ARCHIVE)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) +djmount: $(DJMOUNT_DEPS) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(DJMOUNT_TMP) $(UNTAR)/$(DJMOUNT_SOURCE) $(CHDIR)/$(DJMOUNT_TMP); \ @@ -539,7 +539,7 @@ USHARE_TMP = ushare-uShare_v$(USHARE_VER) USHARE_SOURCE = uShare_v$(USHARE_VER).tar.gz USHARE_SITE = https://github.com/GeeXboX/ushare/archive -$(ARCHIVE)/$(USHARE_SOURCE): +$(DL_DIR)/$(USHARE_SOURCE): $(DOWNLOAD) $(USHARE_SITE)/$(USHARE_SOURCE) USHARE_PATCH = ushare.diff @@ -548,7 +548,7 @@ USHARE_PATCH += ushare-disable-iconv-check.patch USHARE_DEPS = libupnp -ushare: $(USHARE_DEPS) $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR) +ushare: $(USHARE_DEPS) $(DL_DIR)/$(USHARE_SOURCE)| $(TARGET_DIR) $(REMOVE)/$(USHARE_TMP) $(UNTAR)/$(USHARE_SOURCE) $(CHDIR)/$(USHARE_TMP); \ @@ -580,10 +580,10 @@ SMARTMONTOOLS_TMP = smartmontools-$(SMARTMONTOOLS_VER) SMARTMONTOOLS_SOURCE = smartmontools-$(SMARTMONTOOLS_VER).tar.gz SMARTMONTOOLS_SITE = https://sourceforge.net/projects/smartmontools/files/smartmontools/$(SMARTMONTOOLS_VER) -$(ARCHIVE)/$(SMARTMONTOOLS_SOURCE): +$(DL_DIR)/$(SMARTMONTOOLS_SOURCE): $(DOWNLOAD) $(SMARTMONTOOLS_SITE)/$(SMARTMONTOOLS_SOURCE) -smartmontools: $(ARCHIVE)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR) +smartmontools: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(SMARTMONTOOLS_TMP) $(UNTAR)/$(SMARTMONTOOLS_SOURCE) $(CHDIR)/$(SMARTMONTOOLS_TMP); \ @@ -603,12 +603,12 @@ INADYN_TMP = inadyn-$(INADYN_VER) INADYN_SOURCE = inadyn-$(INADYN_VER).tar.xz INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VER) -$(ARCHIVE)/$(INADYN_SOURCE): +$(DL_DIR)/$(INADYN_SOURCE): $(DOWNLOAD) $(INADYN_SITE)/$(INADYN_SOURCE) INADYN_DEPS = openssl confuse libite -inadyn: $(INADYN_DEPS) $(ARCHIVE)/$(INADYN_SOURCE) | $(TARGET_DIR) +inadyn: $(INADYN_DEPS) $(DL_DIR)/$(INADYN_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(INADYN_TMP) $(UNTAR)/$(INADYN_SOURCE) $(CHDIR)/$(INADYN_TMP); \ @@ -637,7 +637,7 @@ VSFTPD_TMP = vsftpd-$(VSFTPD_VER) VSFTPD_SOURCE = vsftpd-$(VSFTPD_VER).tar.gz VSFTPD_SITE = https://security.appspot.com/downloads -$(ARCHIVE)/$(VSFTPD_SOURCE): +$(DL_DIR)/$(VSFTPD_SOURCE): $(DOWNLOAD) $(VSFTPD_SITE)/$(VSFTPD_SOURCE) VSFTPD_PATCH = vsftpd-fix-CVE-2015-1419.patch @@ -647,7 +647,7 @@ VSFTPD_PATCH += vsftpd-login-blank-password.patch VSFTPD_DEPS = openssl -vsftpd: $(VSFTPD_DEPS) $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR) +vsftpd: $(VSFTPD_DEPS) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(VSFTPD_TMP) $(UNTAR)/$(VSFTPD_SOURCE) $(CHDIR)/$(VSFTPD_TMP); \ @@ -672,7 +672,7 @@ PROCPS-NG_TMP = 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 -$(ARCHIVE)/$(PROCPS-NG_SOURCE): +$(DL_DIR)/$(PROCPS-NG_SOURCE): $(DOWNLOAD) $(PROCPS-NG_SITE)/$(PROCPS-NG_SOURCE) PROCPS-NG_PATCH = procps-ng-no-tests-docs.patch @@ -681,7 +681,7 @@ PROCPS-NG_DEPS = ncurses PROCPS-NG_BIN = ps top -procps-ng: $(PROCPS-NG_DEPS) $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) +procps-ng: $(PROCPS-NG_DEPS) $(DL_DIR)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(PROCPS-NG_TMP) $(UNTAR)/$(PROCPS-NG_SOURCE) $(CHDIR)/$(PROCPS-NG_TMP); \ @@ -717,12 +717,12 @@ NANO_TMP = nano-$(NANO_VER) NANO_SOURCE = nano-$(NANO_VER).tar.gz NANO_SITE = https://www.nano-editor.org/dist/v$(basename $(NANO_VER)) -$(ARCHIVE)/$(NANO_SOURCE): +$(DL_DIR)/$(NANO_SOURCE): $(DOWNLOAD) $(NANO_SITE)/$(NANO_SOURCE) NANO_DEPS = ncurses -nano: $(NANO_DEPS) $(ARCHIVE)/$(NANO_SOURCE) | $(TARGET_DIR) +nano: $(NANO_DEPS) $(DL_DIR)/$(NANO_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(NANO_TMP) $(UNTAR)/$(NANO_SOURCE) $(CHDIR)/$(NANO_TMP); \ @@ -746,14 +746,14 @@ MINICOM_TMP = minicom-$(MINICOM_VER) MINICOM_SOURCE = minicom-$(MINICOM_VER).tar.gz MINICOM_SITE = http://fossies.org/linux/misc -$(ARCHIVE)/$(MINICOM_SOURCE): +$(DL_DIR)/$(MINICOM_SOURCE): $(DOWNLOAD) $(MINICOM_SITE)/$(MINICOM_SOURCE) MINICOM_PATCH = minicom-fix-h-v-return-value-is-not-0.patch MINICOM_DEPS = ncurses -minicom: $(MINICOM_DEPS) $(ARCHIVE)/$(MINICOM_SOURCE) | $(TARGET_DIR) +minicom: $(MINICOM_DEPS) $(DL_DIR)/$(MINICOM_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(MINICOM_TMP) $(UNTAR)/$(MINICOM_SOURCE) $(CHDIR)/$(MINICOM_TMP); \ @@ -775,7 +775,7 @@ BASH_TMP = bash-$(BASH_VER) BASH_SOURCE = bash-$(BASH_VER).tar.gz BASH_SITE = http://ftp.gnu.org/gnu/bash -$(ARCHIVE)/$(BASH_SOURCE): +$(DL_DIR)/$(BASH_SOURCE): $(DOWNLOAD) $(BASH_SITE)/$(BASH_SOURCE) BASH_PATCH = $(PATCHES)/bash @@ -785,7 +785,7 @@ define BASH_ADD_TO_SHELLS || echo "/bin/bash" >> $(TARGET_DIR)/etc/shells endef -bash: $(ARCHIVE)/$(BASH_SOURCE) | $(TARGET_DIR) +bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(BASH_TMP) $(UNTAR)/$(BASH_SOURCE) $(CHDIR)/$(BASH_TMP); \ @@ -811,10 +811,10 @@ E2FSPROGS_TMP = e2fsprogs-$(E2FSPROGS_VER) E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VER).tar.gz E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VER) -$(ARCHIVE)/$(E2FSPROGS_SOURCE): +$(DL_DIR)/$(E2FSPROGS_SOURCE): $(DOWNLOAD) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE) -e2fsprogs: $(ARCHIVE)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR) +e2fsprogs: $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(E2FSPROGS_TMP) $(UNTAR)/$(E2FSPROGS_SOURCE) $(CHDIR)/$(E2FSPROGS_TMP); \ @@ -863,10 +863,10 @@ NTFS-3G_TMP = ntfs-3g_ntfsprogs-$(NTFS-3G_VER) NTFS-3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS-3G_VER).tgz NTFS-3G_SITE = https://tuxera.com/opensource -$(ARCHIVE)/$(NTFS-3G_SOURCE): +$(DL_DIR)/$(NTFS-3G_SOURCE): $(DOWNLOAD) $(NTFS-3G_SITE)/$(NTFS-3G_SOURCE) -ntfs-3g: $(ARCHIVE)/$(NTFS-3G_SOURCE) | $(TARGET_DIR) +ntfs-3g: $(DL_DIR)/$(NTFS-3G_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(NTFS-3G_TMP) $(UNTAR)/$(NTFS-3G_SOURCE) $(CHDIR)/$(NTFS-3G_TMP); \ @@ -893,7 +893,7 @@ AUTOFS_TMP = autofs-$(AUTOFS_VER) AUTOFS_SOURCE = autofs-$(AUTOFS_VER).tar.xz AUTOFS_SITE = https://www.kernel.org/pub/linux/daemons/autofs/v5 -$(ARCHIVE)/$(AUTOFS_SOURCE): +$(DL_DIR)/$(AUTOFS_SOURCE): $(DOWNLOAD) $(AUTOFS_SITE)/$(AUTOFS_SOURCE) # cd $(PATCHES)\autofs @@ -905,7 +905,7 @@ AUTOFS_PATCH = force-STRIP-to-emtpy.patch AUTOFS_DEPS = libtirpc -autofs: $(AUTOFS_DEPS) $(ARCHIVE)/$(AUTOFS_SOURCE) | $(TARGET_DIR) +autofs: $(AUTOFS_DEPS) $(DL_DIR)/$(AUTOFS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(AUTOFS_TMP) $(UNTAR)/$(AUTOFS_SOURCE) $(CHDIR)/$(AUTOFS_TMP); \ @@ -952,7 +952,7 @@ SAMBA33_TMP = samba-$(SAMBA33_VER) SAMBA33_SOURCE = samba-$(SAMBA33_VER).tar.gz SAMBA33_SITE = https://download.samba.org/pub/samba -$(ARCHIVE)/$(SAMBA33_SOURCE): +$(DL_DIR)/$(SAMBA33_SOURCE): $(DOWNLOAD) $(SAMBA33_SITE)/$(SAMBA33_SOURCE) SAMBA33_PATCH = samba33-build-only-what-we-need.patch @@ -960,7 +960,7 @@ SAMBA33_PATCH += samba33-configure.in-make-getgrouplist_ok-test-cross-compile.pa SAMBA33_DEPS = zlib -samba33: $(SAMBA33_DEPS) $(ARCHIVE)/$(SAMBA33_SOURCE) | $(TARGET_DIR) +samba33: $(SAMBA33_DEPS) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(SAMBA33_TMP) $(UNTAR)/$(SAMBA33_SOURCE) $(CHDIR)/$(SAMBA33_TMP); \ @@ -1025,7 +1025,7 @@ SAMBA36_TMP = samba-$(SAMBA36_VER) SAMBA36_SOURCE = samba-$(SAMBA36_VER).tar.gz SAMBA36_SITE = https://download.samba.org/pub/samba/stable -$(ARCHIVE)/$(SAMBA36_SOURCE): +$(DL_DIR)/$(SAMBA36_SOURCE): $(DOWNLOAD) $(SAMBA36_SITE)/$(SAMBA36_SOURCE) SAMBA36_PATCH1 = samba36-build-only-what-we-need.patch @@ -1042,7 +1042,7 @@ SAMBA36_PATCH0 += samba36-CVE-2017-7494-v3-6.patch SAMBA36_DEPS = zlib -samba36: $(SAMBA36_DEPS) $(ARCHIVE)/$(SAMBA36_SOURCE) | $(TARGET_DIR) +samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(SAMBA36_TMP) $(UNTAR)/$(SAMBA36_SOURCE) $(CHDIR)/$(SAMBA36_TMP); \ @@ -1106,12 +1106,12 @@ DROPBEAR_TMP = dropbear-$(DROPBEAR_VER) DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VER).tar.bz2 DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases -$(ARCHIVE)/$(DROPBEAR_SOURCE): +$(DL_DIR)/$(DROPBEAR_SOURCE): $(DOWNLOAD) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE) DROPBEAR_DEPS = zlib -dropbear: $(DROPBEAR_DEPS) $(ARCHIVE)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) +dropbear: $(DROPBEAR_DEPS) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(DROPBEAR_TMP) $(UNTAR)/$(DROPBEAR_SOURCE) $(CHDIR)/$(DROPBEAR_TMP); \ @@ -1152,12 +1152,12 @@ SG3_UTILS_TMP = sg3_utils-$(SG3_UTILS_VER) SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VER).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p -$(ARCHIVE)/$(SG3_UTILS_SOURCE): +$(DL_DIR)/$(SG3_UTILS_SOURCE): $(DOWNLOAD) $(SG3_UTILS_SITE)/$(SG3_UTILS_SOURCE) SG3_UTILS_BIN = sg_start -sg3_utils: $(ARCHIVE)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR) +sg3_utils: $(DL_DIR)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(SG3_UTILS_TMP) $(UNTAR)/$(SG3_UTILS_SOURCE) $(CHDIR)/$(SG3_UTILS_TMP); \ @@ -1186,7 +1186,7 @@ FBSHOT_TMP = fbshot-$(FBSHOT_VER) FBSHOT_SOURCE = fbshot-$(FBSHOT_VER).tar.gz FBSHOT_SITE = http://distro.ibiblio.org/amigolinux/download/Utils/fbshot -$(ARCHIVE)/$(FBSHOT_SOURCE): +$(DL_DIR)/$(FBSHOT_SOURCE): $(DOWNLOAD) $(FBSHOT_SITE)/$(FBSHOT_SOURCE) FBSHOT_PATCH = fbshot-32bit_cs_fb.diff @@ -1194,7 +1194,7 @@ FBSHOT_PATCH += fbshot_cs_hd2.diff FBSHOT_DEPS = libpng -fbshot: $(FBSHOT_DEPS) $(ARCHIVE)/$(FBSHOT_SOURCE) | $(TARGET_DIR) +fbshot: $(FBSHOT_DEPS) $(DL_DIR)/$(FBSHOT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FBSHOT_TMP) $(UNTAR)/$(FBSHOT_SOURCE) $(CHDIR)/$(FBSHOT_TMP); \ @@ -1217,7 +1217,7 @@ LCD4LINUX_DEPS = ncurses libgd libdpf lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR) $(REMOVE)/$(LCD4LINUX_TMP) - $(GET-GIT-SOURCE) $(LCD4LINUX_SITE)/$(LCD4LINUX_SOURCE) $(ARCHIVE)/$(LCD4LINUX_SOURCE) + $(GET-GIT-SOURCE) $(LCD4LINUX_SITE)/$(LCD4LINUX_SOURCE) $(DL_DIR)/$(LCD4LINUX_SOURCE) $(CPDIR)/$(LCD4LINUX_SOURCE) $(CHDIR)/$(LCD4LINUX_TMP); \ ./bootstrap; \ @@ -1250,7 +1250,7 @@ SAMSUNGLCD4LINUX_SITE = https://github.com/horsti58 samsunglcd4linux: | $(TARGET_DIR) $(REMOVE)/$(SAMSUNGLCD4LINUX_TMP) - $(GET-GIT-SOURCE) $(SAMSUNGLCD4LINUX_SITE)/$(SAMSUNGLCD4LINUX_SOURCE) $(ARCHIVE)/$(SAMSUNGLCD4LINUX_SOURCE) + $(GET-GIT-SOURCE) $(SAMSUNGLCD4LINUX_SITE)/$(SAMSUNGLCD4LINUX_SOURCE) $(DL_DIR)/$(SAMSUNGLCD4LINUX_SOURCE) $(CPDIR)/$(SAMSUNGLCD4LINUX_SOURCE) $(CHDIR)/$(SAMSUNGLCD4LINUX_TMP)/ni; \ $(INSTALL) -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \ @@ -1265,12 +1265,12 @@ WPA_SUPPLICANT_TMP = wpa_supplicant-$(WPA_SUPPLICANT_VER) WPA_SUPPLICANT_SOURCE = wpa_supplicant-$(WPA_SUPPLICANT_VER).tar.gz WPA_SUPPLICANT_SITE = https://w1.fi/releases -$(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE): +$(DL_DIR)/$(WPA_SUPPLICANT_SOURCE): $(DOWNLOAD) $(WPA_SUPPLICANT_SITE)/$(WPA_SUPPLICANT_SOURCE) WPA_SUPPLICANT_DEPS = openssl -wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET_DIR) +wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(WPA_SUPPLICANT_TMP) $(UNTAR)/$(WPA_SUPPLICANT_SOURCE) $(CHDIR)/$(WPA_SUPPLICANT_TMP)/wpa_supplicant; \ @@ -1300,7 +1300,7 @@ XUPNPD_DEPS = lua openssl xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR) $(REMOVE)/$(XUPNPD_TMP) - $(GET-GIT-SOURCE) $(XUPNPD_SITE)/$(XUPNPD_SOURCE) $(ARCHIVE)/$(XUPNPD_SOURCE) + $(GET-GIT-SOURCE) $(XUPNPD_SITE)/$(XUPNPD_SOURCE) $(DL_DIR)/$(XUPNPD_SOURCE) $(CPDIR)/$(XUPNPD_SOURCE) $(CHDIR)/$(XUPNPD_TMP); \ git checkout 25d6d44; \ @@ -1330,14 +1330,14 @@ DOSFSTOOLS_TMP = dosfstools-$(DOSFSTOOLS_VER) DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VER).tar.xz DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VER) -$(ARCHIVE)/$(DOSFSTOOLS_SOURCE): +$(DL_DIR)/$(DOSFSTOOLS_SOURCE): $(DOWNLOAD) $(DOSFSTOOLS_SITE)/$(DOSFSTOOLS_SOURCE) 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: $(ARCHIVE)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR) +dosfstools: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(DOSFSTOOLS_TMP) $(UNTAR)/$(DOSFSTOOLS_SOURCE) $(CHDIR)/$(DOSFSTOOLS_TMP); \ @@ -1363,7 +1363,7 @@ NFS-UTILS_TMP = 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) -$(ARCHIVE)/$(NFS-UTILS_SOURCE): +$(DL_DIR)/$(NFS-UTILS_SOURCE): $(DOWNLOAD) $(NFS-UTILS_SITE)/$(NFS-UTILS_SOURCE) NFS-UTILS_PATCH = nfs-utils_01-Patch-taken-from-Gentoo.patch @@ -1376,7 +1376,7 @@ NFS-UTILS_DEPS = rpcbind NFS-UTILS_CONF = $(if $(filter $(BOXSERIES), hd1),--disable-ipv6,--enable-ipv6) -nfs-utils: $(NFS-UTILS_DEPS) $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) +nfs-utils: $(NFS-UTILS_DEPS) $(DL_DIR)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(NFS-UTILS_TMP) $(UNTAR)/$(NFS-UTILS_SOURCE) $(CHDIR)/$(NFS-UTILS_TMP); \ @@ -1422,7 +1422,7 @@ RPCBIND_TMP = rpcbind-$(RPCBIND_VER) RPCBIND_SOURCE = rpcbind-$(RPCBIND_VER).tar.bz2 RPCBIND_SITE = https://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VER) -$(ARCHIVE)/$(RPCBIND_SOURCE): +$(DL_DIR)/$(RPCBIND_SOURCE): $(DOWNLOAD) $(RPCBIND_SITE)/$(RPCBIND_SOURCE) RPCBIND_PATCH = rpcbind-0001-Remove-yellow-pages-support.patch @@ -1430,7 +1430,7 @@ RPCBIND_PATCH += rpcbind-0002-add_option_to_fix_port_number.patch RPCBIND_DEPS = libtirpc -rpcbind: $(RPCBIND_DEPS) $(ARCHIVE)/$(RPCBIND_SOURCE) | $(TARGET_DIR) +rpcbind: $(RPCBIND_DEPS) $(DL_DIR)/$(RPCBIND_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(RPCBIND_TMP) $(UNTAR)/$(RPCBIND_SOURCE) $(CHDIR)/$(RPCBIND_TMP); \ @@ -1460,12 +1460,12 @@ FUSE-EXFAT_TMP = 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) -$(ARCHIVE)/$(FUSE-EXFAT_SOURCE): +$(DL_DIR)/$(FUSE-EXFAT_SOURCE): $(DOWNLOAD) $(FUSE-EXFAT_SITE)/$(FUSE-EXFAT_SOURCE) FUSE-EXFAT_DEPS = libfuse -fuse-exfat: $(FUSE-EXFAT_DEPS) $(ARCHIVE)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR) +fuse-exfat: $(FUSE-EXFAT_DEPS) $(DL_DIR)/$(FUSE-EXFAT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(FUSE-EXFAT_TMP) $(UNTAR)/$(FUSE-EXFAT_SOURCE) $(CHDIR)/$(FUSE-EXFAT_TMP); \ @@ -1487,12 +1487,12 @@ EXFAT-UTILS_TMP = 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) -$(ARCHIVE)/$(EXFAT-UTILS_SOURCE): +$(DL_DIR)/$(EXFAT-UTILS_SOURCE): $(DOWNLOAD) $(EXFAT-UTILS_SITE)/$(EXFAT-UTILS_SOURCE) EXFAT-UTILS_DEPS = fuse-exfat -exfat-utils: $(EXFAT-UTILS_DEPS) $(ARCHIVE)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR) +exfat-utils: $(EXFAT-UTILS_DEPS) $(DL_DIR)/$(EXFAT-UTILS_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(EXFAT-UTILS_TMP) $(UNTAR)/$(EXFAT-UTILS_SOURCE) $(CHDIR)/$(EXFAT-UTILS_TMP); \ @@ -1536,10 +1536,10 @@ GETTEXT_TMP = gettext-$(GETTEXT_VER) GETTEXT_SOURCE = gettext-$(GETTEXT_VER).tar.xz GETTEXT_SITE = ftp://ftp.gnu.org/gnu/gettext -$(ARCHIVE)/$(GETTEXT_SOURCE): +$(DL_DIR)/$(GETTEXT_SOURCE): $(DOWNLOAD) $(GETTEXT_SITE)/$(GETTEXT_SOURCE) -gettext: $(ARCHIVE)/$(GETTEXT_SOURCE) | $(TARGET_DIR) +gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(GETTEXT_TMP) $(UNTAR)/$(GETTEXT_SOURCE) $(CHDIR)/$(GETTEXT_TMP)/gettext-runtime; \ @@ -1570,12 +1570,12 @@ MC_TMP = mc-$(MC_VER) MC_SOURCE = mc-$(MC_VER).tar.xz MC_SITE = ftp.midnight-commander.org -$(ARCHIVE)/$(MC_SOURCE): +$(DL_DIR)/$(MC_SOURCE): $(DOWNLOAD) $(MC_SITE)/$(MC_SOURCE) MC_DEPS = glib2 ncurses -mc: $(MC_DEPS) $(ARCHIVE)/$(MC_SOURCE) | $(TARGET_DIR) +mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(MC_TMP) $(UNTAR)/$(MC_SOURCE) $(CHDIR)/$(MC_TMP); \ @@ -1612,7 +1612,7 @@ WGET_TMP = wget-$(WGET_VER) WGET_SOURCE = wget-$(WGET_VER).tar.gz WGET_SITE = https://ftp.gnu.org/gnu/wget -$(ARCHIVE)/$(WGET_SOURCE): +$(DL_DIR)/$(WGET_SOURCE): $(DOWNLOAD) $(WGET_SITE)/$(WGET_SOURCE) WGET_PATCH = set-check_cert-false-by-default.patch @@ -1622,7 +1622,7 @@ WGET_DEPS = openssl WGET_CFLAGS = $(TARGET_CFLAGS) -DOPENSSL_NO_ENGINE -wget: $(WGET_DEPS) $(ARCHIVE)/$(WGET_SOURCE) | $(TARGET_DIR) +wget: $(WGET_DEPS) $(DL_DIR)/$(WGET_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(WGET_TMP) $(UNTAR)/$(WGET_SOURCE) $(CHDIR)/$(WGET_TMP); \ @@ -1667,7 +1667,7 @@ AIO-GRAB_DEPS = zlib libpng libjpeg-turbo aio-grab: $(AIO-GRAB_DEPS) | $(TARGET_DIR) $(REMOVE)/$(AIO-GRAB_TMP) - $(GET-GIT-SOURCE) $(AIO-GRAB_SITE)/$(AIO-GRAB_SOURCE) $(ARCHIVE)/$(AIO-GRAB_SOURCE) + $(GET-GIT-SOURCE) $(AIO-GRAB_SITE)/$(AIO-GRAB_SOURCE) $(DL_DIR)/$(AIO-GRAB_SOURCE) $(CPDIR)/$(AIO-GRAB_SOURCE) $(CHDIR)/$(AIO-GRAB_TMP); \ aclocal --force -I m4; \ @@ -1693,7 +1693,7 @@ DVBSNOOP_SITE = https://github.com/Duckbox-Developers dvbsnoop: | $(TARGET_DIR) $(REMOVE)/$(DVBSNOOP_TMP) - $(GET-GIT-SOURCE) $(DVBSNOOP_SITE)/$(DVBSNOOP_SOURCE) $(ARCHIVE)/$(DVBSNOOP_SOURCE) + $(GET-GIT-SOURCE) $(DVBSNOOP_SITE)/$(DVBSNOOP_SOURCE) $(DL_DIR)/$(DVBSNOOP_SOURCE) $(CPDIR)/$(DVBSNOOP_SOURCE) $(CHDIR)/$(DVBSNOOP_TMP); \ $(CONFIGURE) \ @@ -1713,10 +1713,10 @@ ETHTOOL_TMP = ethtool-$(ETHTOOL_VER) ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VER).tar.xz ETHTOOL_SITE = https://www.kernel.org/pub/software/network/ethtool -$(ARCHIVE)/$(ETHTOOL_SOURCE): +$(DL_DIR)/$(ETHTOOL_SOURCE): $(DOWNLOAD) $(ETHTOOL_SITE)/$(ETHTOOL_SOURCE) -ethtool: $(ARCHIVE)/$(ETHTOOL_SOURCE) | $(TARGET_DIR) +ethtool: $(DL_DIR)/$(ETHTOOL_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(ETHTOOL_TMP) $(UNTAR)/$(ETHTOOL_SOURCE) $(CHDIR)/$(ETHTOOL_TMP); \ @@ -1738,14 +1738,14 @@ GPTFDISK_TMP = gptfdisk-$(GPTFDISK_VER) GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VER).tar.gz GPTFDISK_SITE = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VER) -$(ARCHIVE)/$(GPTFDISK_SOURCE): +$(DL_DIR)/$(GPTFDISK_SOURCE): $(DOWNLOAD) $(GPTFDISK_SITE)/$(GPTFDISK_SOURCE) GPTFDISK_PATCH = gptfdisk-ldlibs.patch GPTFDISK_DEPS = popt e2fsprogs -gptfdisk: $(GPTFDISK_DEPS) $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) +gptfdisk: $(GPTFDISK_DEPS) $(DL_DIR)/$(GPTFDISK_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(GPTFDISK_TMP) $(UNTAR)/$(GPTFDISK_SOURCE) $(CHDIR)/$(GPTFDISK_TMP); \ @@ -1765,12 +1765,12 @@ RSYNC_TMP = rsync-$(RSYNC_VER) RSYNC_SOURCE = rsync-$(RSYNC_VER).tar.gz RSYNC_SITE = https://ftp.samba.org/pub/rsync -$(ARCHIVE)/$(RSYNC_SOURCE): +$(DL_DIR)/$(RSYNC_SOURCE): $(DOWNLOAD) $(RSYNC_SITE)/$(RSYNC_SOURCE) RSYNC_DEPS = zlib popt -rsync: $(RSYNC_DEPS) $(ARCHIVE)/$(RSYNC_SOURCE) | $(TARGET_DIR) +rsync: $(RSYNC_DEPS) $(DL_DIR)/$(RSYNC_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(RSYNC_TMP) $(UNTAR)/$(RSYNC_SOURCE) $(CHDIR)/$(RSYNC_TMP); \ @@ -1795,7 +1795,7 @@ SYSVINIT_TMP = sysvinit-$(SYSVINIT_VER) SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VER).tar.xz SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit -$(ARCHIVE)/$(SYSVINIT_SOURCE): +$(DL_DIR)/$(SYSVINIT_SOURCE): $(DOWNLOAD) $(SYSVINIT_SITE)/$(SYSVINIT_SOURCE) define SYSVINIT_INSTALL @@ -1807,7 +1807,7 @@ define SYSVINIT_INSTALL ln -sf /sbin/killall5 $(TARGET_DIR)/sbin/pidof endef -sysvinit: $(ARCHIVE)/$(SYSVINIT_SOURCE) | $(TARGET_DIR) +sysvinit: $(DL_DIR)/$(SYSVINIT_SOURCE) | $(TARGET_DIR) $(REMOVE)/$(SYSVINIT_TMP) $(UNTAR)/$(SYSVINIT_SOURCE) $(CHDIR)/$(SYSVINIT_TMP); \ @@ -1823,11 +1823,11 @@ sysvinit: $(ARCHIVE)/$(SYSVINIT_SOURCE) | $(TARGET_DIR) CA-BUNDLE_SOURCE = cacert.pem CA-BUNDLE_SITE = https://curl.haxx.se/ca -$(ARCHIVE)/$(CA-BUNDLE_SOURCE): +$(DL_DIR)/$(CA-BUNDLE_SOURCE): $(DOWNLOAD) $(CA-BUNDLE_SITE)/$(CA-BUNDLE_SOURCE) -ca-bundle: $(ARCHIVE)/$(CA-BUNDLE_SOURCE) | $(TARGET_DIR) - $(CD) $(ARCHIVE); \ +ca-bundle: $(DL_DIR)/$(CA-BUNDLE_SOURCE) | $(TARGET_DIR) + $(CD) $(DL_DIR); \ curl --remote-name --time-cond $(CA-BUNDLE_SOURCE) $(CA-BUNDLE_SITE)/$(CA-BUNDLE_SOURCE) || true - $(INSTALL_DATA) -D $(ARCHIVE)/$(CA-BUNDLE_SOURCE) $(TARGET_DIR)/$(CA-BUNDLE_DIR)/$(CA-BUNDLE) + $(INSTALL_DATA) -D $(DL_DIR)/$(CA-BUNDLE_SOURCE) $(TARGET_DIR)/$(CA-BUNDLE_DIR)/$(CA-BUNDLE) $(TOUCH)