svn commit: r273364 - releng/10.1/release

[Glen Barber]

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