From owner-svn-src-all@FreeBSD.ORG  Tue Nov  4 14:42:22 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E7CFD4F2;
 Tue,  4 Nov 2014 14:42:22 +0000 (UTC)
Received: from smtp.des.no (smtp.des.no [194.63.250.102])
 by mx1.freebsd.org (Postfix) with ESMTP id A7D71CCE;
 Tue,  4 Nov 2014 14:42:22 +0000 (UTC)
Received: from nine.des.no (smtp.des.no [194.63.250.102])
 by smtp-int.des.no (Postfix) with ESMTP id D7D6CA3CD;
 Tue,  4 Nov 2014 14:42:20 +0000 (UTC)
Received: by nine.des.no (Postfix, from userid 1001)
 id B85C510D1D; Tue,  4 Nov 2014 15:42:20 +0100 (CET)
From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Glen Barber <gjb@FreeBSD.org>
Subject: Re: svn commit: r273653 - head/release
References: <201410260141.s9Q1ft59057852@svn.freebsd.org>
Date: Tue, 04 Nov 2014 15:42:20 +0100
In-Reply-To: <201410260141.s9Q1ft59057852@svn.freebsd.org> (Glen Barber's
 message of "Sun, 26 Oct 2014 01:41:55 +0000 (UTC)")
Message-ID: <86mw8710z7.fsf@nine.des.no>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Nov 2014 14:42:23 -0000

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