diff options
| -rw-r--r-- | mk/buildsystem.mk | 2 | ||||
| -rw-r--r-- | mk/macros.packages.mk | 6 | ||||
| -rw-r--r-- | packages/system/upstart/upstart.mk | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 86692d9..3f19c79 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -176,4 +176,4 @@ endef rmallpath: $(Q)rm -rf $(PACKAGES_BUILD)* $(ROOTFS)* $(TOOLS)* $(TOOLS_BUILD)* $(Q)rm -rf $(SYSROOT)* $(HOSTTOOLS)* $(EMBTK_GENERATED)/rootfs-* - $(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(DOWNLOAD_DIR)/*.patch) + $(Q)$(if $(CONFIG_EMBTK_CACHE_PATCHES),,rm -rf $(embtk_dldir)/*.patch) diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 9ac7301..593faf6 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -27,7 +27,7 @@ # wget wrapper # usage: $(call embtk_wget,$(OUTPUT_FILE),$(SITE),$(FOREIGN_FILE)) # -__wget_outfile = $(patsubst %/,%,$(DOWNLOAD_DIR))/$(strip $(1)) +__wget_outfile = $(patsubst %/,%,$(embtk_dldir))/$(strip $(1)) __wget_remotesite = $(patsubst %/,%,$(strip $(2))) __wget_foreignfiles = $(strip $(3)) __wget_opts = --tries=5 --timeout=10 --waitretry=5 @@ -115,7 +115,7 @@ __embtk_pkg_site = $(strip $($(PKGV)_SITE)) __embtk_patch_site = ftp://ftp.embtoolkit.org/embtoolkit.org __embtk_patch_url = $(__embtk_patch_site)/$(__embtk_pkg_name)/$(__embtk_pkg_version) __embtk_pkg_patch_site = $(strip $(or $($(PKGV)_PATCH_SITE),$(__embtk_patch_url))) -__embtk_pkg_patch_f = $(strip $(DOWNLOAD_DIR))/$(__embtk_pkg_name)-$(__embtk_pkg_version).patch +__embtk_pkg_patch_f = $(strip $(embtk_dldir))/$(__embtk_pkg_name)-$(__embtk_pkg_version).patch __embtk_pkg_mirror = $(__embtk_patch_site)/packages-mirror __embtk_pkg_mirror1 = $(strip $($(PKGV)_MIRROR1)) __embtk_pkg_mirror2 = $(strip $($(PKGV)_MIRROR2)) @@ -140,7 +140,7 @@ __embtk_pkg_localgit = $(strip $(if $(__embtk_pkg_usegit), \ __embtk_pkg_version = $(or $(strip $($(PKGV)_VERSION)),$(__embtk_pkg_usegit),$(__embtk_pkg_usesvn)) -__embtk_pkg_package_f = $(strip $(DOWNLOAD_DIR))/$(__embtk_pkg_package) +__embtk_pkg_package_f = $(strip $(embtk_dldir))/$(__embtk_pkg_package) __embtk_pkg_srcdir = $(or $(__embtk_pkg_localgit),$(__embtk_pkg_localsvn),$(patsubst %/,%,$(strip $($(PKGV)_SRC_DIR)))) __embtk_pkg_builddir = $(patsubst %/,%,$(strip $($(PKGV)_BUILD_DIR))) diff --git a/packages/system/upstart/upstart.mk b/packages/system/upstart/upstart.mk index 35b4b1e..980138e 100644 --- a/packages/system/upstart/upstart.mk +++ b/packages/system/upstart/upstart.mk @@ -53,21 +53,21 @@ $(UPSTART_BUILD_DIR)/.installed: $(UPSTART_DEPS) download_upstart \ download_upstart: $(call embtk_pinfo,"Downloading $(UPSTART_PACKAGE) \ if necessary...") - @test -e $(DOWNLOAD_DIR)/$(UPSTART_PACKAGE) || \ - wget -O $(DOWNLOAD_DIR)/$(UPSTART_PACKAGE) \ + @test -e $(embtk_dldir)/$(UPSTART_PACKAGE) || \ + wget -O $(embtk_dldir)/$(UPSTART_PACKAGE) \ $(UPSTART_SITE)/$(UPSTART_PACKAGE) ifeq ($(CONFIG_EMBTK_UPSTART_NEED_PATCH),y) - @test -e $(DOWNLOAD_DIR)/upstart-$(UPSTART_VERSION).patch || \ - wget -O $(DOWNLOAD_DIR)/upstart-$(UPSTART_VERSION).patch \ + @test -e $(embtk_dldir)/upstart-$(UPSTART_VERSION).patch || \ + wget -O $(embtk_dldir)/upstart-$(UPSTART_VERSION).patch \ $(UPSTART_PATCH_SITE)/upstart-$(UPSTART_VERSION)-*.patch endif $(UPSTART_BUILD_DIR)/.decompressed: $(call embtk_pinfo,"Decompressing $(UPSTART_PACKAGE) ...") - @tar -C $(PACKAGES_BUILD) -xzf $(DOWNLOAD_DIR)/$(UPSTART_PACKAGE) + @tar -C $(PACKAGES_BUILD) -xzf $(embtk_dldir)/$(UPSTART_PACKAGE) ifeq ($(CONFIG_EMBTK_UPSTART_NEED_PATCH),y) @cd $(UPSTART_BUILD_DIR); \ - patch -p1 < $(DOWNLOAD_DIR)/upstart-$(UPSTART_VERSION).patch + patch -p1 < $(embtk_dldir)/upstart-$(UPSTART_VERSION).patch endif @touch $@ |