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
This commit is contained in:
parent
2cba8dd301
commit
745ca08586
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=274095
@ -56,10 +56,10 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo
|
|||||||
.for _V in ${TARGET_ARCH}
|
.for _V in ${TARGET_ARCH}
|
||||||
.if !empty(TARGET:M${_V})
|
.if !empty(TARGET:M${_V})
|
||||||
OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}
|
OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}
|
||||||
VOLUME_LABEL= ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET}
|
VOLUME_LABEL= ${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET}
|
||||||
.else
|
.else
|
||||||
OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
|
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
|
.endif
|
||||||
.endfor
|
.endfor
|
||||||
.endif
|
.endif
|
||||||
|
Loading…
Reference in New Issue
Block a user