svn commit: r303378 - user/cperciva/freebsd-update-build/scripts

[Gleb Smirnoff]

Author: glebius
Date: Wed Jul 27 09:26:46 2016
New Revision: 303378
URL: https://svnweb.freebsd.org/changeset/base/303378

Log:
  Starting with FreeBSD 11 we will use dvd1 disk instead of disc1, since we
  need kernel-dbg distribution. For 11.0-BETA1 and 11.0-BETA2 this was done
  as override, but we should use it as default.
  
  In case if 10.4-RELEASE will use disc1, we will create override for 10.4
  build only.
  
  Discussed with:	delphij, gjb

Modified:
  user/cperciva/freebsd-update-build/scripts/build.subr

Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr	Wed Jul 27 09:23:04 2016	(r303377)
+++ user/cperciva/freebsd-update-build/scripts/build.subr	Wed Jul 27 09:26:46 2016	(r303378)
@@ -302,9 +302,9 @@ checkinit () {
 fetchiso () {
 	log "Starting fetch"
 
-	# Figure out where the disc1 ISO image is
+	# Figure out where the dvd1 ISO image is
 	RELNUM=${REL%-*}
-	ISO=${FTP}/FreeBSD-${REL}-${TARGET}-disc1.iso
+	ISO=${FTP}/releases/${TARGET}/${TARGET}/ISO-IMAGES/${RELNUM}/FreeBSD-${REL}-${TARGET}-dvd1.iso
 
 	# Fetch the ISO image.  We consider the ISO image to be
 	# the One True Release and don't look at the files used
@@ -313,11 +313,11 @@ fetchiso () {
 	# again.
 	fetch -o ${WORKDIR}/iso.img -rR ${ISO} 2>&1
 
-	log "Verifying disc1 hash"
+	log "Verifying dvd1 hash"
 
 	# Check that the downloaded ISO has the correct hash.
 	if ! [ "`sha512 -q ${WORKDIR}/iso.img`" = "${RELH}" ]; then
-		echo "FreeBSD ${REL}-${TARGET}-disc1.iso has incorrect hash."
+		echo "FreeBSD ${REL}-${TARGET}-dvd1.iso has incorrect hash."
 		rm ${WORKDIR}/iso.img
 		return 1
 	fi