Author: gjb
Date: Fri Sep 12 18:23:22 2014
New Revision: 271477
URL: http://svnweb.freebsd.org/changeset/base/271477
Log:
Connect the UEFI-capable disc1.iso and dvd1.iso variants
to the build.
This is a direct commit to stable/10.
Approved by: re (marius)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/Makefile
Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile Fri Sep 12 18:20:35 2014 (r271476)
+++ stable/10/release/Makefile Fri Sep 12 18:23:22 2014 (r271477)
@@ -97,6 +97,16 @@ IMAGES+= mini-memstick.img
RELEASE_TARGETS+=uefi-memstick.img
IMAGES+= uefi-memstick.img
.endif
+.if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh)
+RELEASE_TARGETS+=uefi-disc1.iso
+RELEASE_TARGETS+=uefi-bootonly.iso
+IMAGES+= uefi-disc1.iso
+IMAGES+= uefi-bootonly.iso
+. if defined(WITH_DVD) && !empty(WITH_DVD)
+RELEASE_TARGETS+=uefi-dvd1.iso
+IMAGES+= uefi-dvd1.iso
+. endif
+.endif
CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES}
.if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
@@ -220,9 +230,24 @@ release.iso: disc1.iso
disc1.iso: system
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET}
release
+uefi-disc1.iso: system
+.if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh)
+ sh ${.CURDIR}/${TARGET}/mkisoimages-uefi.sh -b FreeBSD_Install
${.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
+.endif
+
dvd1.iso: dvd pkg-stage
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.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
+.endif
+
bootonly.iso: bootonly
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET}
bootonly
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
