| Message ID | 1429737867-1754-1-git-send-email-arnout@mind.be |
|---|---|
| State | Superseded |
| Headers | show |
Dear Arnout Vandecappelle (Essensium/Mind), On Wed, 22 Apr 2015 23:24:27 +0200, Arnout Vandecappelle (Essensium/Mind) wrote: > ifndef $(2)_VERSION > ifdef $(3)_VERSION > $(2)_DL_VERSION := $$(strip $$($(3)_VERSION)) > - $(2)_VERSION := $$(subst /,_,$$(strip $$($(3)_VERSION))) > + $(2)_VERSION := $$(subst $(space),_,$$(subst :,_,$$(subst /,_,$$(strip $$($(3)_VERSION))))) > else > $(2)_VERSION = undefined > $(2)_DL_VERSION = undefined > endif > else > $(2)_DL_VERSION := $$(strip $$($(2)_VERSION)) > - $(2)_VERSION := $$(strip $$(subst /,_,$$($(2)_VERSION))) > + $(2)_VERSION := $$(subst $$(space),_,$$(subst :,_,$$(subst /,_,$$(strip $$($(2)_VERSION))))) > endif Since this code is now a bit more complicated, maybe we should have a function in pkg-utils.mk for this? Thomas
Gustavo, All, On 2015-04-22 23:24 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly: > Using a colon or a space in a make target doesn't work, so they have to > be filtered out of the PKG_VERSION variable just like the / currently > already is. > > This will be needed for date-based CVS versions. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > Cc: Fabio Porcedda <fabio.porcedda@gmail.com> > Cc: Yann E. MORIN <yann.morin.1998@free.fr> > --- > package/pkg-generic.mk | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index d1a1811..eeccf5b 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -322,17 +322,19 @@ $(2)_RAWNAME = $$(patsubst host-%,%,$(1)) > # sanitize the package version that is used in paths, directory and file names. > # Forward slashes may appear in the package's version when pointing to a > # version control system branch or tag, for example remotes/origin/1_10_stable. > +# Similar for spaces and colons (:) that may appear in date-based revisions for > +# CVS. > ifndef $(2)_VERSION > ifdef $(3)_VERSION > $(2)_DL_VERSION := $$(strip $$($(3)_VERSION)) > - $(2)_VERSION := $$(subst /,_,$$(strip $$($(3)_VERSION))) > + $(2)_VERSION := $$(subst $(space),_,$$(subst :,_,$$(subst /,_,$$(strip $$($(3)_VERSION))))) > else > $(2)_VERSION = undefined > $(2)_DL_VERSION = undefined > endif > else > $(2)_DL_VERSION := $$(strip $$($(2)_VERSION)) > - $(2)_VERSION := $$(strip $$(subst /,_,$$($(2)_VERSION))) > + $(2)_VERSION := $$(subst $$(space),_,$$(subst :,_,$$(subst /,_,$$(strip $$($(2)_VERSION))))) Here, you'r ealso changing (for the better!) the order we call strip/subst. Note that the way you did is better *and* is aligned with the host variant, above. Previously, there was discrepancy betwee nthe hos and target variants. That change may warrant at least a sentence in the commit log. Regards, Yann E. MORIN. > endif > > $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) > -- > 2.1.4 >
On 04/22/15 23:24, Arnout Vandecappelle (Essensium/Mind) wrote: > Using a colon or a space in a make target doesn't work, so they have to > be filtered out of the PKG_VERSION variable just like the / currently > already is. > > This will be needed for date-based CVS versions. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > Cc: Fabio Porcedda <fabio.porcedda@gmail.com> > Cc: Yann E. MORIN <yann.morin.1998@free.fr> > --- > package/pkg-generic.mk | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index d1a1811..eeccf5b 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -322,17 +322,19 @@ $(2)_RAWNAME = $$(patsubst host-%,%,$(1)) > # sanitize the package version that is used in paths, directory and file names. > # Forward slashes may appear in the package's version when pointing to a > # version control system branch or tag, for example remotes/origin/1_10_stable. > +# Similar for spaces and colons (:) that may appear in date-based revisions for > +# CVS. > ifndef $(2)_VERSION > ifdef $(3)_VERSION > $(2)_DL_VERSION := $$(strip $$($(3)_VERSION)) > - $(2)_VERSION := $$(subst /,_,$$(strip $$($(3)_VERSION))) > + $(2)_VERSION := $$(subst $(space),_,$$(subst :,_,$$(subst /,_,$$(strip $$($(3)_VERSION))))) Hold it, something is wrong here, because the host version gets an extra _ appended... D'oh, $(space) should be $$(space) :-( Regards, Arnout > else > $(2)_VERSION = undefined > $(2)_DL_VERSION = undefined > endif > else > $(2)_DL_VERSION := $$(strip $$($(2)_VERSION)) > - $(2)_VERSION := $$(strip $$(subst /,_,$$($(2)_VERSION))) > + $(2)_VERSION := $$(subst $$(space),_,$$(subst :,_,$$(subst /,_,$$(strip $$($(2)_VERSION))))) > endif > > $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) >
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index d1a1811..eeccf5b 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -322,17 +322,19 @@ $(2)_RAWNAME = $$(patsubst host-%,%,$(1)) # sanitize the package version that is used in paths, directory and file names. # Forward slashes may appear in the package's version when pointing to a # version control system branch or tag, for example remotes/origin/1_10_stable. +# Similar for spaces and colons (:) that may appear in date-based revisions for +# CVS. ifndef $(2)_VERSION ifdef $(3)_VERSION $(2)_DL_VERSION := $$(strip $$($(3)_VERSION)) - $(2)_VERSION := $$(subst /,_,$$(strip $$($(3)_VERSION))) + $(2)_VERSION := $$(subst $(space),_,$$(subst :,_,$$(subst /,_,$$(strip $$($(3)_VERSION))))) else $(2)_VERSION = undefined $(2)_DL_VERSION = undefined endif else $(2)_DL_VERSION := $$(strip $$($(2)_VERSION)) - $(2)_VERSION := $$(strip $$(subst /,_,$$($(2)_VERSION))) + $(2)_VERSION := $$(subst $$(space),_,$$(subst :,_,$$(subst /,_,$$(strip $$($(2)_VERSION))))) endif $(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
Using a colon or a space in a make target doesn't work, so they have to be filtered out of the PKG_VERSION variable just like the / currently already is. This will be needed for date-based CVS versions. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Cc: Fabio Porcedda <fabio.porcedda@gmail.com> Cc: Yann E. MORIN <yann.morin.1998@free.fr> --- package/pkg-generic.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)