Commit f17222f5 authored by Arnout Vandecappelle's avatar Arnout Vandecappelle Committed by Thomas Petazzoni
Browse files

pkg-generic: substitute colon and space out of PKG_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.

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: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent d9ae279e

package/pkg-generic.mk

+4 −2
Original line number Diff line number Diff line
@@ -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)

package/pkg-utils.mk

+5 −0
Original line number Diff line number Diff line
@@ -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