diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-08-19 19:21:15 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-08-25 23:08:17 +0200 |
| commit | 1939011ce6f5cfafebd2c12b2b2c49b0753c59fb (patch) | |
| tree | 5b0c4eb6a3db47a52fe2b9271009cf42c89153c1 /package/pkg-generic.mk | |
| parent | e05c6a791d11dbbd619e6be2ebb990cb21db0832 (diff) | |
package/infra: fix downloading versions with a slash
Since cset 54456cc (infra: consistently use double dollar signs...), it
is no longer possible to download versions with a slash in it, because
the _DL_VERSION variable is second-expanded, but the _VERSION variable
is immediately-expanded to have '/' substitued with '_'.
So, _DL_VERSION is only expanded at the time it is evaluated, and by
that time, we've lost the slashes in _VERSION.
Make the _DL_VERSION variables immediately-evaluated.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=7328
Reported-by: Vincent Stehlé <vincent.stehle@freescale.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Vincent Stehlé <vincent.stehle@freescale.com>
Acked-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/pkg-generic.mk')
| -rw-r--r-- | package/pkg-generic.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index fb4b849f9..d04fd36db 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -318,14 +318,14 @@ $(2)_RAWNAME = $$(patsubst host-%,%,$(1)) # version control system branch or tag, for example remotes/origin/1_10_stable. ifndef $(2)_VERSION ifdef $(3)_VERSION - $(2)_DL_VERSION = $$($(3)_VERSION) + $(2)_DL_VERSION := $$($(3)_VERSION) $(2)_VERSION := $$(subst /,_,$$($(3)_VERSION)) else $(2)_VERSION = undefined $(2)_DL_VERSION = undefined endif else - $(2)_DL_VERSION = $$($(2)_VERSION) + $(2)_DL_VERSION := $$($(2)_VERSION) $(2)_VERSION := $$(subst /,_,$$($(2)_VERSION)) endif |