Date: Tue, 4 Nov 2014 23:02:17 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r274102 - stable/10/release Message-ID: <201411042302.sA4N2HUs063811@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Nov 4 23:02:16 2014 New Revision: 274102 URL: https://svnweb.freebsd.org/changeset/base/274102 Log: MFC r274095: Fix VOLUME_LABEL when BRANCH contains '-' and '.' characters, in particular '-' and '.'. Insta-MFC ok: re (hrs) Sponsored by: The FreeBSD Foundation Modified: stable/10/release/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/release/Makefile ============================================================================== --- stable/10/release/Makefile Tue Nov 4 22:47:51 2014 (r274101) +++ stable/10/release/Makefile Tue Nov 4 23:02:16 2014 (r274102) @@ -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?201411042302.sA4N2HUs063811>