svn commit: r273354 - stable/10/release
Glen Barber
gjb at FreeBSD.org
Tue Oct 21 00:06:04 UTC 2014
Author: gjb
Date: Tue Oct 21 00:06:03 2014
New Revision: 273354
URL: https://svnweb.freebsd.org/changeset/base/273354
Log:
MFC r273204:
Add more descriptive metadata to the ISO images.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile Mon Oct 20 23:34:47 2014 (r273353)
+++ stable/10/release/Makefile Tue Oct 21 00:06:03 2014 (r273354)
@@ -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}_UEFICD \
+ ${.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
More information about the svn-src-stable-10
mailing list