| Message ID | 20180331142407.9522-5-maxime.hadjinlian@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
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 <maxime.hadjinlian@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 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 >
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)' ) \
Let the infrastructure use the new variable $(PKG)_DL_DIR Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- package/pkg-download.mk | 2 +- package/pkg-generic.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)