diff options
| author | gjb <gjb@FreeBSD.org> | 2014-11-04 23:02:16 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-11-04 23:02:16 +0000 |
| commit | 94b1b738687b766f5bec09130331c42d0f5e0655 (patch) | |
| tree | bd6b7dc9e728995becc17b8d69089df62e5d029e /release | |
| parent | 7f7167d476be057fafca22b5c9b231a0c3415336 (diff) | |
| download | FreeBSD-src-94b1b738687b766f5bec09130331c42d0f5e0655.zip FreeBSD-src-94b1b738687b766f5bec09130331c42d0f5e0655.tar.gz | |
MFC r274095:
Fix VOLUME_LABEL when BRANCH contains '-' and '.'
characters, in particular '-' and '.'.
Insta-MFC ok: re (hrs)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index 25fe033..6198b8e 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 |
