From owner-svn-src-releng@FreeBSD.ORG  Tue Oct 21 02:41:41 2014
Return-Path: <owner-svn-src-releng@FreeBSD.ORG>
Delivered-To: svn-src-releng@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 679EBBC7;
 Tue, 21 Oct 2014 02:41:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 39B4EF29;
 Tue, 21 Oct 2014 02:41:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9L2ffoN062611;
 Tue, 21 Oct 2014 02:41:41 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9L2ffqU062610;
 Tue, 21 Oct 2014 02:41:41 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201410210241.s9L2ffqU062610@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 21 Oct 2014 02:41:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r273364 - releng/10.1/release
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Oct 2014 02:41:41 -0000

Author: gjb
Date: Tue Oct 21 02:41:40 2014
New Revision: 273364
URL: https://svnweb.freebsd.org/changeset/base/273364

Log:
  MFstable10 r273354:
    MFC r273204:
    Add more descriptive metadata to the ISO images.
  
  MFstable10 r273355:
    Fix label for the UEFI bootonly cd.
  
  PR:		165876
  Approved by:	re (hrs)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/10.1/release/Makefile
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/release/Makefile
==============================================================================
--- releng/10.1/release/Makefile	Tue Oct 21 01:57:36 2014	(r273363)
+++ releng/10.1/release/Makefile	Tue Oct 21 02:41:40 2014	(r273364)
@@ -62,6 +62,8 @@ OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}
 .endfor
 .endif
 
+VOLUME_LABEL=	${OSRELEASE:C/[-\.]/_/g:S/^$${TYPE}_//}
+
 .if !exists(${DOCDIR})
 NODOC= true
 .endif
@@ -254,28 +256,31 @@ dvd:
 
 release.iso: disc1.iso
 disc1.iso: system
-	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
+	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ${.TARGET} release
 
 uefi-disc1.iso: system
 .if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh)
-	sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b FreeBSD_Install ${.TARGET} release
+	sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b ${VOLUME_LABEL}_UEFICD \
+		${.TARGET} release
 .endif
 
 uefi-bootonly.iso: bootonly
 .if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh)
-	sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b FreeBSD_Install ${.TARGET} bootonly
+	sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b ${VOLUME_LABEL}_UEFIBO \
+		${.TARGET} bootonly
 .endif
 
 dvd1.iso: dvd pkg-stage
-	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} dvd
+	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ${.TARGET} dvd
 
 uefi-dvd1.iso: dvd pkg-stage
 .if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh)
-	sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b FreeBSD_Install ${.TARGET} dvd
+	sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b ${VOLUME_LABEL}_UEFIDVD \
+		${.TARGET} dvd
 .endif
 
 bootonly.iso: bootonly
-	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly
+	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ${.TARGET} bootonly
 
 memstick: memstick.img
 memstick.img: system