Date: Tue, 04 Nov 2014 16:51:45 +0100 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Glen Barber <gjb@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r273653 - head/release Message-ID: <86bnon0xri.fsf@nine.des.no> In-Reply-To: <86fvdz10ca.fsf@nine.des.no> ("Dag-Erling =?utf-8?Q?Sm=C3=B8r?= =?utf-8?Q?grav=22's?= message of "Tue, 04 Nov 2014 15:56:05 %2B0100") References: <201410260141.s9Q1ft59057852@svn.freebsd.org> <86mw8710z7.fsf@nine.des.no> <86fvdz10ca.fsf@nine.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
This works:
Index: release/Makefile
===================================================================
--- release/Makefile.orig
+++ release/Makefile
@@ -56,10 +56,10 @@
.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
DES
--
Dag-Erling Smørgrav - des@des.no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86bnon0xri.fsf>