diff mbox series

[v4,05/13] pkg-{download, generic}: use new $($(PKG)_DL_DIR)

Message ID 20180402081434.4411-5-maxime.hadjinlian@gmail.com
State Superseded
Headers show
Series [v4,01/13] core/pkg-download: change all helpers to use common options | expand

Commit Message

Maxime Hadjinlian April 2, 2018, 8:14 a.m. UTC 
Let the infrastructure use the new variable $(PKG)_DL_DIR

Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 package/pkg-download.mk | 2 +-
 package/pkg-generic.mk  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Yann E. MORIN April 2, 2018, 11:06 a.m. UTC | #1 
Maxime, All,

On 2018-04-02 10:14 +0200, Maxime Hadjinlian spake thusly:
> Let the infrastructure use the new variable $(PKG)_DL_DIR

There were a few remaining other instances that needed changing, we've
done that IRL together.

Regards,
Yann E. MORIN.

> Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  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 2ee745fddd..151b2e5423 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -95,7 +95,7 @@ define DOWNLOAD
>  		-H $(PKGDIR)/$($(PKG)_RAWNAME).hash \
>  		-n $($(PKG)_BASENAME_RAW) \
>  		-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 25a34e6ca2..e7f4a0402d 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -613,7 +613,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
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni April 2, 2018, 12:09 p.m. UTC | #2 
Hello,

On Mon, 2 Apr 2018 13:06:57 +0200, Yann E. MORIN wrote:
> Maxime, All,
> 
> On 2018-04-02 10:14 +0200, Maxime Hadjinlian spake thusly:
> > Let the infrastructure use the new variable $(PKG)_DL_DIR  
> 
> There were a few remaining other instances that needed changing, we've
> done that IRL together.

And also $($(PKG)_DL_DIR) is not "new".

Thomas
diff mbox series

Patch

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 2ee745fddd..151b2e5423 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -95,7 +95,7 @@  define DOWNLOAD
 		-H $(PKGDIR)/$($(PKG)_RAWNAME).hash \
 		-n $($(PKG)_BASENAME_RAW) \
 		-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 25a34e6ca2..e7f4a0402d 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -613,7 +613,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)' ) \