diff options
| author | gjb <gjb@FreeBSD.org> | 2014-11-04 17:24:13 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-11-04 17:24:13 +0000 |
| commit | f9cdf3e5ad831c4d81c3fda9c1b893d2df22d419 (patch) | |
| tree | b5e43d666cdfaa4c4dfe4b6d0200e3b00bbda77e /release/Makefile | |
| parent | abae099c34995505ef7feb6904d893c18a88994d (diff) | |
| download | FreeBSD-src-f9cdf3e5ad831c4d81c3fda9c1b893d2df22d419.zip FreeBSD-src-f9cdf3e5ad831c4d81c3fda9c1b893d2df22d419.tar.gz | |
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
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index fe401f3..6d9b5e2 100644 --- 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 |
