Date: Tue, 4 Nov 2014 17:24:14 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274095 - head/release Message-ID: <201411041724.sA4HOEGD098532@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Nov 4 17:24:13 2014 New Revision: 274095 URL: https://svnweb.freebsd.org/changeset/base/274095 Log: 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 Modified: head/release/Makefile Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Tue Nov 4 17:05:24 2014 (r274094) +++ head/release/Makefile Tue Nov 4 17:24:13 2014 (r274095) @@ -56,10 +56,10 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' $ .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411041724.sA4HOEGD098532>