Hook sgi IP28 kernels into the build. While there, update the iso images to

provide IP22 and IP28 kernels, as well as the ECOFF bootblock.

No objection from deraadt@

4 files changed, 64 insertions, 90 deletions

diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index f1c64750fbc..382697c20ee 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 2011/04/18 16:52:10 thib Exp $
+#	$OpenBSD: Makefile,v 1.12 2012/05/25 17:32:38 miod Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -8,9 +8,14 @@ BSDRD=	bsd.rd
 CDROM=	cd${REV}.iso
 FFS=	ffs.img
 # must match the size of `minicdroot' in disktab
-CDFSMB=	10
+CDFSMB=	12
 all: ${CDROM}
 
+ALLIP=		22 27 28 30 32
+
+# Note regarding sgivol -h value:
+# boot32 currently (2012/05/25) needs 87 512 byte sectors, boot64 needs 200,
+# bootecoff needs 77, and we need to keep some room for growth.
 ${CDROM}:
 	-rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/
@@ -20,21 +25,14 @@ ${CDROM}:
 	newfs /dev/rvnd0a
 	mount /dev/vnd0a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSrev}/sgi
-	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP27 > \
-	    ${.OBJDIR}/cd-dir/bsd.IP27
-	ln ${.OBJDIR}/cd-dir/bsd.IP27 ${.OBJDIR}/cd-dir/bsd.rd.IP27
-	ln ${.OBJDIR}/cd-dir/bsd.IP27 ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.IP27
-	ln ${.OBJDIR}/cd-dir/bsd.IP27 ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.rd.IP27
-	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP30 > \
-	    ${.OBJDIR}/cd-dir/bsd.IP30
-	ln ${.OBJDIR}/cd-dir/bsd.IP30 ${.OBJDIR}/cd-dir/bsd.rd.IP30
-	ln ${.OBJDIR}/cd-dir/bsd.IP30 ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.IP30
-	ln ${.OBJDIR}/cd-dir/bsd.IP30 ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.rd.IP30
-	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP32 > \
-	    ${.OBJDIR}/cd-dir/bsd.IP32
-	ln ${.OBJDIR}/cd-dir/bsd.IP32 ${.OBJDIR}/cd-dir/bsd.rd.IP32
-	ln ${.OBJDIR}/cd-dir/bsd.IP32 ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.IP32
-	ln ${.OBJDIR}/cd-dir/bsd.IP32 ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.rd.IP32
+.for IP in ${ALLIP}
+	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP${IP} > \
+	    ${.OBJDIR}/cd-dir/bsd.IP${IP}
+	ln ${.OBJDIR}/cd-dir/bsd.IP${IP} ${.OBJDIR}/cd-dir/bsd.rd.IP${IP}
+	ln ${.OBJDIR}/cd-dir/bsd.IP${IP} ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.IP${IP}
+	ln ${.OBJDIR}/cd-dir/bsd.IP${IP} ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.rd.IP${IP}
+.endfor
+	cp ${DESTDIR}/usr/mdec/bootecoff ${.OBJDIR}/cd-dir/bootecoff
 	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/cd-dir/boot32
 	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/cd-dir/boot64
 	umount ${.OBJDIR}/cd-dir
@@ -42,8 +40,9 @@ ${CDROM}:
 	vnconfig -u vnd0
 	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=`expr ${CDFSMB} + 2`
 	vnconfig -v -c vnd0 ${.OBJDIR}/${CDROM}
-	# boot32 needs 77, boot64 needs 173, and add some room for growth
-	/usr/mdec/sgivol -i -h 320 vnd0 > ${.OBJDIR}/volhdr
+	/usr/mdec/sgivol -i -h 400 vnd0 > ${.OBJDIR}/volhdr
+	/usr/mdec/sgivol -w bootecoff ${DESTDIR}/usr/mdec/bootecoff vnd0
+	/usr/mdec/sgivol -l bootecoff sash vnd0
 	/usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 vnd0
 	/usr/mdec/sgivol -l boot32 sashARCS vnd0
 	/usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 vnd0
diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index 38e453c4277..28772a8ed89 100644
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2011/04/18 16:52:10 thib Exp $
+#	$OpenBSD: Makefile,v 1.18 2012/05/25 17:32:38 miod Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -8,13 +8,16 @@ CDROM=		install${REV}.iso
 RELXDIR?=	/home/relx-${MACHINE}
 RELDIR?=	/home/rel-${MACHINE}
 
+ALLIP=		22 27 28 30 32
+
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz \
-		${RELDIR}/bsd.IP27 ${RELDIR}/bsd.rd.IP27 \
-		${RELDIR}/bsd.IP30 ${RELDIR}/bsd.rd.IP30 \
-		${RELDIR}/bsd.IP32 ${RELDIR}/bsd.rd.IP32 \
 		${RELDIR}/INSTALL.${MACHINE}
+.for IP in ${ALLIP}
+BASE+=		${RELDIR}/bsd.IP${IP} ${RELDIR}/bsd.rd.IP${IP}
+.endfor
+BASE+=		${RELDIR}/bsd.mp.IP30
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
 		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
 		${RELXDIR}/xserv${OSrev}.tgz
@@ -22,18 +25,20 @@ XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
 all: ${CDROM}
 
 # Note regarding sgivol -h value:
-# boot32 currently needs 20 2048 byte sectors, boot64 currently needs 44,
-# and there is some room for growth.
-# IF THIS VALUE IS EVER CHANGED, make sure it is consistent with the cdroot
+# boot32 currently (2012/05/25) needs 22 2048 byte sectors, boot64 needs 50,
+# bootecoff needs 20, and we need to keep some room for growth.
+# IF THIS VALUE IS EVER CHANGED, make sure it is consistent with the `cdroot'
 # layout in /etc/disktab!
 ${CDROM}:
 	-rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/
 
-	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=2048b count=280
+	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=2048b count=300
 	vnconfig -v -c -t cdroot vnd0 ${.OBJDIR}/${CDROM}
 
-	/usr/mdec/sgivol -i -h 80 vnd0
+	/usr/mdec/sgivol -i -h 128 vnd0
+	/usr/mdec/sgivol -w bootecoff ${DESTDIR}/usr/mdec/bootecoff vnd0
+	/usr/mdec/sgivol -l bootecoff sash vnd0
 	/usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 vnd0
 	/usr/mdec/sgivol -l boot32 sashARCS vnd0
 	/usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 vnd0
@@ -44,20 +49,21 @@ ${CDROM}:
 	mount /dev/vnd0a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
+	cp ${DESTDIR}/usr/mdec/bootecoff ${.OBJDIR}/cd-dir/bootecoff
 	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/cd-dir/boot32
 	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/cd-dir/boot64
+	ln ${.OBJDIR}/cd-dir/bootecoff ${.OBJDIR}/cd-dir/boot-IP22
 	ln ${.OBJDIR}/cd-dir/boot64 ${.OBJDIR}/cd-dir/boot-IP27
+	ln ${.OBJDIR}/cd-dir/boot64 ${.OBJDIR}/cd-dir/boot-IP28
 	ln ${.OBJDIR}/cd-dir/boot64 ${.OBJDIR}/cd-dir/boot-IP30
 	ln ${.OBJDIR}/cd-dir/boot32 ${.OBJDIR}/cd-dir/boot-IP32
 
 	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd.IP27 \
-	    ${.OBJDIR}/cd-dir/bsd.rd.IP27
-	ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd.IP30 \
-	    ${.OBJDIR}/cd-dir/bsd.rd.IP30
-	ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd.IP32 \
-	    ${.OBJDIR}/cd-dir/bsd.rd.IP32
+.for IP in ${ALLIP}
+	ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd.IP${IP} \
+	    ${.OBJDIR}/cd-dir/bsd.rd.IP${IP}
+.endfor
 
 	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index 545f5d5f453..fe6614257b6 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2012/03/29 20:27:53 miod Exp $
+#	$OpenBSD: Makefile,v 1.18 2012/05/25 17:32:38 miod Exp $
 
 REV=		${OSrev}
 
@@ -33,59 +33,32 @@ all ${IMAGE}:
 	@false
 .else
 
-all:	${BSD_RD}.IP22 ${BSD_RD}.IP27 ${BSD_RD}.IP30 ${BSD_RD}.IP32
-
-${BSD_RD}.IP22: ${CBIN} ${IMAGE} bsd.IP22 rdsetroot
-	cp bsd.IP22 ${BSD_RD}.IP22
-	${.OBJDIR}/rdsetroot ${BSD_RD}.IP22 ${IMAGE}
-
-${BSD_RD}.IP27: ${CBIN} ${IMAGE} bsd.IP27 rdsetroot
-	cp bsd.IP27 ${BSD_RD}.IP27
-	${.OBJDIR}/rdsetroot ${BSD_RD}.IP27 ${IMAGE}
-
-${BSD_RD}.IP30: ${CBIN} ${IMAGE} bsd.IP30 rdsetroot
-	cp bsd.IP30 ${BSD_RD}.IP30
-	${.OBJDIR}/rdsetroot ${BSD_RD}.IP30 ${IMAGE}
-
-${BSD_RD}.IP32: ${CBIN} ${IMAGE} bsd.IP32 rdsetroot
-	cp bsd.IP32 ${BSD_RD}.IP32
-	${.OBJDIR}/rdsetroot ${BSD_RD}.IP32 ${IMAGE}
-
-${IMAGE}: rd_setup do_files rd_teardown
-
-.endif
-
-bsd.IP22:
+ALLIP=		22 27 28 30 32
+ALLBSD=
+ALLBSDRD=
+.for IP in ${ALLIP}
+ALLBSD+=	bsd.IP${IP}
+ALLBSDRD+=	${BSD_RD}.IP${IP}
+all:	${ALLBSDRD}
+.endfor
+
+.for IP in ${ALLIP}
+bsd.IP${IP}:
 .ifndef NOBUILD
-	cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP22
-	cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP22 && \
+	cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP${IP}
+	cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP} && \
 	    ${MAKE} clean && exec ${MAKE}
 .endif
-	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP22/bsd bsd.IP22
+	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP${IP}/bsd bsd.IP${IP}
 
-bsd.IP27:
-.ifndef NOBUILD
-	cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP27
-	cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP27 && \
-	    ${MAKE} clean && exec ${MAKE}
-.endif
-	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP27/bsd bsd.IP27
+${BSD_RD}.IP${IP}: ${CBIN} ${IMAGE} bsd.IP${IP} rdsetroot
+	cp bsd.IP${IP} ${BSD_RD}.IP${IP}
+	${.OBJDIR}/rdsetroot ${BSD_RD}.IP${IP} ${IMAGE}
+.endfor
 
-bsd.IP30:
-.ifndef NOBUILD
-	cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP30
-	cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP30 && \
-	    ${MAKE} clean && ${MAKE}
-.endif
-	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP30/bsd bsd.IP30
+${IMAGE}: rd_setup do_files rd_teardown
 
-bsd.IP32:
-.ifndef NOBUILD
-	cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP32
-	cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP32 && \
-	    ${MAKE} clean && ${MAKE}
 .endif
-	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP32/bsd bsd.IP32
 
 rd_setup: 
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
@@ -129,16 +102,11 @@ do_files:
 
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
-	    bsd.IP22 ${BSD_RD}.IP22 \
-	    bsd.IP27 ${BSD_RD}.IP27 \
-	    bsd.IP30 ${BSD_RD}.IP30 \
-	    bsd.IP32 ${BSD_RD}.IP32 \
-	    *.o *.lo *.c rdsetroot
+	    ${ALLBSD} ${ALLBSDRD} *.o *.lo *.c rdsetroot
 
 .ifdef RELEASEDIR
 install:
-	cp ${BSD_RD}.IP22 ${BSD_RD}.IP27 ${BSD_RD}.IP30 ${BSD_RD}.IP32 \
-	    ${RELEASEDIR}
+	cp ${ALLBSDRD} ${RELEASEDIR}
 .endif
 
 .include <bsd.obj.mk>
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index fb1a4c8121e..444b894ede1 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.31 2012/03/29 20:27:53 miod Exp $
+#	$OpenBSD: list,v 1.32 2012/05/25 17:32:38 miod Exp $
 
 SRCDIRS distrib/special
 SRCDIRS bin sbin usr.bin usr.sbin
@@ -65,6 +65,7 @@ COPY	${DESTDIR}/usr/mdec/boot32		usr/mdec/boot32
 SYMLINK	/usr/mdec/boot32			usr/mdec/boot-IP32
 COPY	${DESTDIR}/usr/mdec/boot64		usr/mdec/boot64
 SYMLINK	/usr/mdec/boot64			usr/mdec/boot-IP27
+SYMLINK	/usr/mdec/boot64			usr/mdec/boot-IP28
 SYMLINK	/usr/mdec/boot64			usr/mdec/boot-IP30
 COPY	${DESTDIR}/usr/mdec/bootecoff		usr/mdec/bootecoff
 SYMLINK	/usr/mdec/bootecoff			usr/mdec/boot-IP22
@@ -101,5 +102,5 @@ SCRIPT	${CURDIR}/../../miniroot/install.sh	install
 SCRIPT	${CURDIR}/../../miniroot/install.sub	install.sub
 SPECIAL	chmod 755 install upgrade sbin/dhclient-script
 
-HASH	var/hash	bsd.IP22 bsd.IP27 bsd.IP30 bsd.mp.IP30 bsd.IP32
+HASH	var/hash	bsd.IP22 bsd.IP27 bsd.IP28 bsd.IP30 bsd.mp.IP30 bsd.IP32
 TZ