The thought of making more than one DVD image for a release really

freaks me out.  But it turns out we might be able to generalize
a few of the other things RE uses to assemble the package trees
for releases if the DVDs use a naming theme close to what is used
for the CDROMS (disc1, disc2, etc).  So change the name to dvd1.
Hopefully this way src/release/scripts/{package-split.py,package-trees.sh}
can be generalized instead of copied-and-hacked.

MFC after:	5 days

1 files changed, 31 insertions, 31 deletions

diff --git a/release/Makefile b/release/Makefile
index 5481b68..62f30b8 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -265,7 +265,7 @@ CD_BOOT=		${CD}/bootonly
 CD_DISC1=		${CD}/disc1
 CD_DISC2=		${CD}/disc2
 .if defined(MAKE_DVD)
-CD_DVD=			${CD}/dvd
+CD_DVD1=		${CD}/dvd1
 .endif
 .if !defined(NODOC)
 CD_DOCS=		${CD}/docs
@@ -930,13 +930,13 @@ cdrom.1:
 	done
 .if defined(MAKE_DVD)
 	@echo "Building DVD filesystem image as well as CDROM"
-	@mkdir -p ${CD_DVD}/${BUILDNAME}
+	@mkdir -p ${CD_DVD1}/${BUILDNAME}
 	@for i in ${DISTRIBUTIONS} ; \
 	do \
 		if [ -d ${RD}/trees/$${i} ] ; then \
 			chflags -R noschg ${RD}/trees/$${i} || true ; \
 			( cd ${RD}/trees/$${i} && \
-			    find . -depth -print | cpio -dumpl ${CD_DVD} ) ; \
+			    find . -depth -print | cpio -dumpl ${CD_DVD1} ) ; \
 		fi \
 	done
 .endif
@@ -958,21 +958,21 @@ cdrom.1:
 	@cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints
 .endif
 .if defined(MAKE_DVD)
-	@cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD}/boot/kernel
-	@rm -f ${CD_DVD}/boot/kernel/*.symbols
-	@rm -f ${CD_DVD}/.profile
-	@cp ${.CURDIR}/fixit.profile ${CD_DVD}/.profile
-	@ln -sf /rescue ${CD_DVD}/stand
+	@cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD1}/boot/kernel
+	@rm -f ${CD_DVD1}/boot/kernel/*.symbols
+	@rm -f ${CD_DVD1}/.profile
+	@cp ${.CURDIR}/fixit.profile ${CD_DVD1}/.profile
+	@ln -sf /rescue ${CD_DVD1}/stand
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
-	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD}/cdrom.inf
-	@rm -f ${CD_DVD}/boot/loader.conf
-	@cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD}/boot/mfsroot.gz
-	@echo 'mfsroot_load="YES"' > ${CD_DVD}/boot/loader.conf
-	@echo 'mfsroot_type="mfs_root"' >> ${CD_DVD}/boot/loader.conf
-	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD}/boot/loader.conf
+	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
+	@rm -f ${CD_DVD1}/boot/loader.conf
+	@cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD1}/boot/mfsroot.gz
+	@echo 'mfsroot_load="YES"' > ${CD_DVD1}/boot/loader.conf
+	@echo 'mfsroot_type="mfs_root"' >> ${CD_DVD1}/boot/loader.conf
+	@echo 'mfsroot_name="/boot/mfsroot"' >> ${CD_DVD1}/boot/loader.conf
 .if exists(${RD}/trees/base/boot/device.hints)
-	@rm -f ${CD_DVD}/boot/device.hints
-	@cp ${RD}/trees/base/boot/device.hints ${CD_DVD}/boot/device.hints
+	@rm -f ${CD_DVD1}/boot/device.hints
+	@cp ${RD}/trees/base/boot/device.hints ${CD_DVD1}/boot/device.hints
 .endif
 .endif
 	touch ${.TARGET}
@@ -1011,26 +1011,26 @@ cdrom.2:
 	@echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf
 .if defined(MAKE_DVD)
 .if defined(MAKE_FLOPPIES)
-	@cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD}
+	@cd ${RD} && find floppies -print | cpio -dumpl ${CD_DVD1}
 .endif
-	@cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD}/${BUILDNAME}
+	@cd ${RD}/dists && find . -print | cpio -dumpl ${CD_DVD1}/${BUILDNAME}
 .if !defined(NODOC)
 	@for i in ${DIST_DOCS_ARCH_INDEP}; do \
 	  cp ${RND}/${RELNOTES_LANG}/$$i/article.txt \
-	      ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	      ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
 	  cp ${RND}/${RELNOTES_LANG}/$$i/article.html \
-	      ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	      ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
 	@for i in ${DIST_DOCS_ARCH_DEP}; do \
 	  cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt \
-	      ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
+	      ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \
 	  cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.html \
-	      ${CD_DVD}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
+	      ${CD_DVD1}/`echo $${i} | tr 'a-z' 'A-Z'`.HTM; \
 	done
-	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD}
+	@cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DVD1}
 .endif
-	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD}/cdrom.inf
-	@echo "CD_VOLUME = 1" >> ${CD_DVD}/cdrom.inf
+	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
+	@echo "CD_VOLUME = 1" >> ${CD_DVD1}/cdrom.inf
 .endif
 .if !defined(NODOC)
 	echo "Building CDROM docs filesystem image"
@@ -1038,7 +1038,7 @@ cdrom.2:
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf
 	@mkdir -p ${CD_DOCS}/usr/share/doc
 .if defined(MAKE_DVD)
-	@mkdir -p ${CD_DVD}/usr/share/doc
+	@mkdir -p ${CD_DVD1}/usr/share/doc
 .endif
 	@for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \
 		if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \
@@ -1049,7 +1049,7 @@ cdrom.2:
 	done
 .if defined(MAKE_DVD)
 	@cd ${CD_DOCS}/usr/share/doc && find . -print | \
-	    cpio -dumpl ${CD_DVD}/usr/share/doc
+	    cpio -dumpl ${CD_DVD1}/usr/share/doc
 .endif
 .endif
 	touch ${.TARGET}
@@ -1081,8 +1081,8 @@ CD_DISC1_PKGS=	${CD_PACKAGE_TREE}/disc1
 .if exists(${CD_PACKAGE_TREE}/disc2)
 CD_DISC2_PKGS=	${CD_PACKAGE_TREE}/disc2
 .endif
-.if exists(${CD_PACKAGE_TREE}/dvd)
-CD_DVD_PKGS=	${CD_PACKAGE_TREE}/dvd
+.if exists(${CD_PACKAGE_TREE}/dvd1)
+CD_DVD1_PKGS=	${CD_PACKAGE_TREE}/dvd1
 .endif
 .endif
 .endif
@@ -1106,8 +1106,8 @@ iso.1:
 .if defined(MAKE_DVD)
 	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
 	    FreeBSD_Install \
-	    ${CD}/${BUILDNAME}-${TARGET}-dvd.iso ${CD_DVD} \
-	    ${CD_DVD_PKGS}
+	    ${CD}/${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \
+	    ${CD_DVD1_PKGS}
 .endif
 .if !defined(NODOC)
 	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \