From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Sun, 1 Apr 2018 20:20:57 +0200 Subject: [Buildroot] [v3 05/13] pkg-{download, generic}: use new $($(PKG)_DL_DIR) In-Reply-To: <20180331142407.9522-5-maxime.hadjinlian@gmail.com> References: <20180331142407.9522-1-maxime.hadjinlian@gmail.com> <20180331142407.9522-5-maxime.hadjinlian@gmail.com> Message-ID: <20180401182057.GN2613@scaer> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Maxime, all, On 2018-03-31 16:23 +0200, Maxime Hadjinlian spake thusly: > Let the infrastructure use the new variable $(PKG)_DL_DIR > > Signed-off-by: Maxime Hadjinlian Reviewed-by: "Yann E. MORIN" Regards, Yann E. MORIN. > --- > package/pkg-download.mk | 2 +- > package/pkg-generic.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/pkg-download.mk b/package/pkg-download.mk > index 14ea4ff361..0717943bb0 100644 > --- a/package/pkg-download.mk > +++ b/package/pkg-download.mk > @@ -95,7 +95,7 @@ define DOWNLOAD > -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ > -n $($(PKG)_RAW_BASE_NAME) \ > -N $($(PKG)_RAWNAME) \ > - -o $(DL_DIR)/$(notdir $(1)) \ > + -o $($(PKG)_DL_DIR)/$(notdir $(1)) \ > $(if $($(PKG)_GIT_SUBMODULES),-r) \ > $(DOWNLOAD_URIS) \ > $(QUIET) \ > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 6d82f7027e..7587324368 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -609,7 +609,7 @@ $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned > > # default extract command > $(2)_EXTRACT_CMDS ?= \ > - $$(if $$($(2)_SOURCE),$$(INFLATE$$(suffix $$($(2)_SOURCE))) $$(DL_DIR)/$$($(2)_SOURCE) | \ > + $$(if $$($(2)_SOURCE),$$(INFLATE$$(suffix $$($(2)_SOURCE))) $$($(2)_DL_DIR)/$$($(2)_SOURCE) | \ > $$(TAR) --strip-components=$$($(2)_STRIP_COMPONENTS) \ > -C $$($(2)_DIR) \ > $$(foreach x,$$($(2)_EXCLUDES),--exclude='$$(x)' ) \ > -- > 2.16.2 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'