[Midnightbsd-cvs] src: Makefile: Switch to 3 disc iso setup like 0.2.1

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 1 21:55:37 EDT 2008


Log Message:
-----------
Switch to 3 disc iso setup like 0.2.1

Modified Files:
--------------
    src/release:
        Makefile (r1.18 -> r1.19)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/release/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -L release/Makefile -L release/Makefile -u -r1.18 -r1.19
--- release/Makefile
+++ release/Makefile
@@ -28,7 +28,7 @@
 #
 #CHROOTDIR=/junk/release
 # If this is a -stable snapshot, then set
-#RELEASETAG=RELENG_0
+#RELEASETAG=RELENG_0_2
 #
 # To test a release with a source tree containing patches and
 # other work. This tree will get copied instead of getting the
@@ -232,6 +232,7 @@
 CD_BOOT=		${CD}/bootonly
 CD_DISC1=		${CD}/disc1
 CD_DISC2=		${CD}/disc2
+CD_DISC3=		${CD}/disc3
 .if defined(SEPARATE_LIVEFS)
 CD_LIVEFS=		${CD}/livefs
 .else
@@ -730,9 +731,7 @@
 	-test -f ${.CURDIR}/install.cfg \
 	    && cp ${.CURDIR}/install.cfg ${RD}/mfsfd
 	@mkdir -p ${RD}/mfsfd/boot
-.if ${TARGET_ARCH} != "ia64" && ${TARGET_ARCH} != "powerpc"
 	@cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot
-.endif
 .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64"
 	@cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot
 .endif
@@ -904,7 +903,7 @@
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
 	touch ${.TARGET}
 
-# Build disc1 and disc2 cdrom images
+# Build disc1, disc2, and disc3 cdrom images
 cdrom.2:
 	@echo "Building CDROM disc1 filesystem image"
 	@mkdir -p ${CD_DISC1}/${BUILDNAME}
@@ -938,6 +937,10 @@
 	@mkdir -p ${CD_DISC2}
 	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
 	@echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf
+	@echo "Building CDROM disc3 filesystem image"
+	@mkdir -p ${CD_DISC3}
+	@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC3}/cdrom.inf
+	@echo "CD_VOLUME = 3" >> ${CD_DISC3}/cdrom.inf
 .if !defined(NODOC)
 	@mkdir -p ${CD_DISC2}/usr/share/doc
 	@for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \
@@ -977,6 +980,9 @@
 .if exists(${CD_PACKAGE_TREE}/disc2)
 CD_DISC2_PKGS=	${CD_PACKAGE_TREE}/disc2
 .endif
+.if exists(${CD_PACKAGE_TREE}/disc3)
+CD_DISC3_PKGS=	${CD_PACKAGE_TREE}/disc3
+.endif
 .endif
 .endif
 
@@ -996,6 +1002,10 @@
 	    MidnightBSD_Packages \
 	    ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \
 	    ${CD_DISC2_PKGS}
+	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \
+	    MidnightBSD_Packages_2 \
+	    ${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DISC3} \
+	    ${CD_DISC3_PKGS}
 .if defined(SEPARATE_LIVEFS)
 	@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
 	    MidnightBSD_LiveFS \


More information about the Midnightbsd-cvs mailing list