Date: Tue, 04 Nov 2014 15:42:20 +0100 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Glen Barber <gjb@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r273653 - head/release Message-ID: <86mw8710z7.fsf@nine.des.no> In-Reply-To: <201410260141.s9Q1ft59057852@svn.freebsd.org> (Glen Barber's message of "Sun, 26 Oct 2014 01:41:55 %2B0000 (UTC)") References: <201410260141.s9Q1ft59057852@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Glen Barber <gjb@FreeBSD.org> writes:
> Modified: head/release/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- 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}!=3D eval $$(awk '/^${_V}=3D/{print}' $
> .for _V in ${TARGET_ARCH}
> .if !empty(TARGET:M${_V})
> OSRELEASE=3D ${TYPE}-${REVISION}-${BRANCH}-${TARGET}
> +VOLUME_LABEL=3D ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET}
> .else
> OSRELEASE=3D ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
> +VOLUME_LABEL=3D ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH}
> .endif
> .endfor
> .endif
>=20=20
> -VOLUME_LABEL=3D ${OSRELEASE:C/[-\.]/_/g:S/^$${TYPE}_//}
> +.if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL)
> +VOLUME_LABEL=3D FreeBSD_Install
> +.endif
>=20=20
> .if !exists(${DOCDIR})
> NODOC=3D 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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- release/Makefile.orig
+++ release/Makefile
@@ -56,10 +56,10 @@
.for _V in ${TARGET_ARCH}
.if !empty(TARGET:M${_V})
OSRELEASE=3D ${TYPE}-${REVISION}-${BRANCH}-${TARGET}
-VOLUME_LABEL=3D ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET}
+VOLUME_LABEL=3D ${REVISION:C/[-\.]/_/g:}_${BRANCH}_${TARGET}
.else
OSRELEASE=3D ${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
-VOLUME_LABEL=3D ${REVISION:C/\./_/g:}_${BRANCH}_${TARGET_ARCH}
+VOLUME_LABEL=3D ${REVISION:C/[-\.]/_/g:}_${BRANCH}_${TARGET_ARCH}
.endif
.endfor
.endif
DES
--=20
Dag-Erling Sm=C3=B8rgrav - des@des.no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86mw8710z7.fsf>