Glen Barber <g...@freebsd.org> writes:
> Modified: head/release/Makefile
> ==============================================================================
> --- head/release/Makefile Sun Oct 26 01:30:46 2014 (r273652)
> +++ head/release/Makefile Sun Oct 26 01:41:54 2014 (r273653)
> @@ -56,13 +56,17 @@ ${_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}
> .else
> OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
> +VOLUME_LABEL= ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH}
> .endif
> .endfor
> .endif
>
> -VOLUME_LABEL= ${OSRELEASE:C/[-\.]/_/g:S/^$${TYPE}_//}
> +.if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL)
> +VOLUME_LABEL= FreeBSD_Install
> +.endif
>
> .if !exists(${DOCDIR})
> NODOC= true
This broke "make release", because the volume label now contains
hyphens, so makefs rejects it. I'm not sure how we even managed to
release RC4 with this :(
Index: release/Makefile
===================================================================
--- release/Makefile.orig
+++ release/Makefile
@@ -56,10 +56,10 @@
.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}_${TARGET}
.else
OSRELEASE= ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
-VOLUME_LABEL= ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH}
+VOLUME_LABEL= ${REVISION:C/[-\.]/_/g:}_${BRANCH}_${TARGET_ARCH}
.endif
.endfor
.endif
DES
--
Dag-Erling Smørgrav - d...@des.no
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
