* [Buildroot] [PATCH] package/infra: fix downloading versions with a slash
@ 2014-08-19 17:21 Yann E. MORIN
2014-08-20 7:33 ` Vincent Stehlé
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Yann E. MORIN @ 2014-08-19 17:21 UTC (permalink / raw)
To: buildroot
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>
---
package/pkg-generic.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index fb4b849..d04fd36 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
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/infra: fix downloading versions with a slash
2014-08-19 17:21 [Buildroot] [PATCH] package/infra: fix downloading versions with a slash Yann E. MORIN
@ 2014-08-20 7:33 ` Vincent Stehlé
2014-08-21 14:45 ` Thomas De Schampheleire
2014-08-25 21:10 ` Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Vincent Stehlé @ 2014-08-20 7:33 UTC (permalink / raw)
To: buildroot
On 08/19/2014 07:21 PM, Yann E. MORIN wrote:
> Make the _DL_VERSION variables immediately-evaluated.
>
> Fixes:
> https://bugs.busybox.net/show_bug.cgi?id=7328
Hi,
I re-checked manually this patch, and let my continuous integration jobs
run with it during the night: everything is fine. Thanks again!
Tested-by: Vincent Stehl? <vincent.stehle@freescale.com>
Best regards,
V.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/infra: fix downloading versions with a slash
2014-08-19 17:21 [Buildroot] [PATCH] package/infra: fix downloading versions with a slash Yann E. MORIN
2014-08-20 7:33 ` Vincent Stehlé
@ 2014-08-21 14:45 ` Thomas De Schampheleire
2014-08-24 18:31 ` Thomas De Schampheleire
2014-08-25 21:10 ` Thomas Petazzoni
2 siblings, 1 reply; 5+ messages in thread
From: Thomas De Schampheleire @ 2014-08-21 14:45 UTC (permalink / raw)
To: buildroot
On Tue, Aug 19, 2014 at 7:21 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> 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>
(tested by temporary setting DTC_VERSION to 'refs/tags/v1.4.0' as
proposed in the bug report)
Best regards,
Thomas
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/infra: fix downloading versions with a slash
2014-08-21 14:45 ` Thomas De Schampheleire
@ 2014-08-24 18:31 ` Thomas De Schampheleire
0 siblings, 0 replies; 5+ messages in thread
From: Thomas De Schampheleire @ 2014-08-24 18:31 UTC (permalink / raw)
To: buildroot
On Thu, Aug 21, 2014 at 4:45 PM, Thomas De Schampheleire
<patrickdepinguin@gmail.com> wrote:
> On Tue, Aug 19, 2014 at 7:21 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>> 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>
> (tested by temporary setting DTC_VERSION to 'refs/tags/v1.4.0' as
> proposed in the bug report)
>
This patch should be applied to master, according to me.
Best regards,
Thomas
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH] package/infra: fix downloading versions with a slash
2014-08-19 17:21 [Buildroot] [PATCH] package/infra: fix downloading versions with a slash Yann E. MORIN
2014-08-20 7:33 ` Vincent Stehlé
2014-08-21 14:45 ` Thomas De Schampheleire
@ 2014-08-25 21:10 ` Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2014-08-25 21:10 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Tue, 19 Aug 2014 19:21:15 +0200, Yann E. MORIN wrote:
> 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>
Applied, thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-08-25 21:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-19 17:21 [Buildroot] [PATCH] package/infra: fix downloading versions with a slash Yann E. MORIN
2014-08-20 7:33 ` Vincent Stehlé
2014-08-21 14:45 ` Thomas De Schampheleire
2014-08-24 18:31 ` Thomas De Schampheleire
2014-08-25 21:10 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.