[Buildroot] [PATCH] pkg-generic: substitute colon and space out of PKG_VERSION
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Wed Apr 22 21:24:27 UTC 2015
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 at mind.be>
Cc: Fabio Porcedda <fabio.porcedda at gmail.com>
Cc: Yann E. MORIN <yann.morin.1998 at 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)))))
endif
$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
--
2.1.4
More information about the buildroot
mailing list