Fix VOLUME_LABEL when BRANCH contains non-alpha

characters, in particular '-' and '.'.

Submitted by:	des
Tested by:	des
MFC after:	3 days
X-MFC-10.1:	yes
Sponsored by:	The FreeBSD Foundation

diff --git a/release/Makefile b/release/Makefile
index fe401f3b55f546a153a5bb2edb834227baa8b916..6d9b5e2639d691534b0c6d185c944f1fbf7740ed 100644 (file)
--- a/release/Makefile
+++ b/release/Makefile
@@ -56,10 +56,10 @@ ${_V}!=     eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo
 .for _V in ${TARGET_ARCH}
 .if !empty(TARGET:M${_V})
 OSRELEASE=     ${TYPE}-${REVISION}-${BRANCH}-${TARGET}
-VOLUME_LABEL=  ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET}
+VOLUME_LABEL=  ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET}
 .else
 OSRELEASE=     ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
-VOLUME_LABEL=  ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH}
+VOLUME_LABEL=  ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH}
 .endif
 .endfor
 .endif