* [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION
2015-04-22 21:24 [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION Arnout Vandecappelle
@ 2015-04-22 21:28 ` Thomas Petazzoni
2015-04-22 21:39 ` Yann E. MORIN
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2015-04-22 21:28 UTC (permalink / raw)
To: buildroot
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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION
2015-04-22 21:24 [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION Arnout Vandecappelle
2015-04-22 21:28 ` Thomas Petazzoni
@ 2015-04-22 21:39 ` Yann E. MORIN
2015-04-22 22:44 ` Arnout Vandecappelle
2015-04-22 23:08 ` Arnout Vandecappelle
3 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2015-04-22 21:39 UTC (permalink / raw)
To: buildroot
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
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION
2015-04-22 21:24 [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION Arnout Vandecappelle
2015-04-22 21:28 ` Thomas Petazzoni
2015-04-22 21:39 ` Yann E. MORIN
@ 2015-04-22 22:44 ` Arnout Vandecappelle
2015-04-22 23:08 ` Arnout Vandecappelle
3 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-04-22 22:44 UTC (permalink / raw)
To: buildroot
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)
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION
2015-04-22 21:24 [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION Arnout Vandecappelle
` (2 preceding siblings ...)
2015-04-22 22:44 ` Arnout Vandecappelle
@ 2015-04-22 23:08 ` Arnout Vandecappelle
2015-04-25 8:27 ` Yann E. MORIN
3 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2015-04-22 23:08 UTC (permalink / raw)
To: buildroot
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.
Add a helper macro 'sanitize' in pkg-utils.mk to implement this. This
also moves the strip to the inner level for the target branch.
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>
---
Changes v1 -> v2:
- Move to a helper macro (Thomas).
- Add moving of strip to commit message (Yann).
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
package/pkg-generic.mk | 6 ++++--
package/pkg-utils.mk | 5 +++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index d1a1811..455bdf1 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 := $$(call sanitize,$$($(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 := $$(call sanitize,$$($(2)_VERSION))
endif
$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 5a385f8..99a3c1e 100644
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -37,6 +37,11 @@ endef
$(eval $(call caseconvert-helper,UPPERCASE,$(join $(addsuffix :,$([FROM])),$([TO]))))
$(eval $(call caseconvert-helper,LOWERCASE,$(join $(addsuffix :,$([TO])),$([FROM]))))
+# Sanitize macro cleans up generic strings so it can be used as a filename
+# and in rules. Particularly useful for VCS version strings, that can contain
+# slashes, colons (OK in filenames but not in rules), and spaces.
+sanitize = $(subst $(space),_,$(subst :,_,$(subst /,_,$(strip $(1)))))
+
#
# Manipulation of .config files based on the Kconfig
# infrastructure. Used by the BusyBox package, the Linux kernel
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION
2015-04-22 23:08 ` Arnout Vandecappelle
@ 2015-04-25 8:27 ` Yann E. MORIN
0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2015-04-25 8:27 UTC (permalink / raw)
To: buildroot
Arnout, All,
On 2015-04-23 01:08 +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.
>
> Add a helper macro 'sanitize' in pkg-utils.mk to implement this. This
> also moves the strip to the inner level for the target branch.
>
> 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>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> Changes v1 -> v2:
> - Move to a helper macro (Thomas).
> - Add moving of strip to commit message (Yann).
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> package/pkg-generic.mk | 6 ++++--
> package/pkg-utils.mk | 5 +++++
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index d1a1811..455bdf1 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 := $$(call sanitize,$$($(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 := $$(call sanitize,$$($(2)_VERSION))
> endif
>
> $(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> index 5a385f8..99a3c1e 100644
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -37,6 +37,11 @@ endef
> $(eval $(call caseconvert-helper,UPPERCASE,$(join $(addsuffix :,$([FROM])),$([TO]))))
> $(eval $(call caseconvert-helper,LOWERCASE,$(join $(addsuffix :,$([TO])),$([FROM]))))
>
> +# Sanitize macro cleans up generic strings so it can be used as a filename
> +# and in rules. Particularly useful for VCS version strings, that can contain
> +# slashes, colons (OK in filenames but not in rules), and spaces.
> +sanitize = $(subst $(space),_,$(subst :,_,$(subst /,_,$(strip $(1)))))
> +
> #
> # Manipulation of .config files based on the Kconfig
> # infrastructure. Used by the BusyBox package, the Linux kernel
> --
> 2.1.4
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread