| Message ID | 1408468875-6811-1-git-send-email-yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
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.
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
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
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
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
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(-)