Build IP27 and IP30 kernels on sgi; put then on the cdrom images too

(although for now our cd images fail to boot on IP27 and IP30).

5 files changed, 93 insertions, 43 deletions

diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index 999704f13ff..fb7d9e55bcf 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2009/05/16 16:06:55 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2009/05/30 04:01:27 miod Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -6,28 +6,35 @@ TOP=	${.CURDIR}/..
 
 BSDRD=	bsd.rd
 CDROM=	cd${REV}.iso
-CDROM2=	cd${REV}.tmp
 FFS=	ffs.img
 all: ${CDROM}
 
 ${CDROM}:
 	-rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/
-	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/boot32
-	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/boot64
-	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD} > ${.OBJDIR}/bsd
 	dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=1m count=8
 	vnconfig -v -c svnd0 ${.OBJDIR}/${FFS}
-	disklabel -w svnd0 rdroot "OpenBSD/sgi     "
+	disklabel -w svnd0 minicdroot "OpenBSD/sgi     "
 	newfs /dev/rsvnd0a
 	mount /dev/svnd0a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSrev}/sgi
-	cp ${.OBJDIR}/bsd ${.OBJDIR}/cd-dir/bsd
-	ln ${.OBJDIR}/cd-dir/bsd ${.OBJDIR}/cd-dir/bsd.rd
-	ln ${.OBJDIR}/cd-dir/bsd ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd
-	ln ${.OBJDIR}/cd-dir/bsd ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.rd
-	cp ${.OBJDIR}/boot32 ${.OBJDIR}/cd-dir/boot32
-	cp ${.OBJDIR}/boot64 ${.OBJDIR}/cd-dir/boot64
+	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
+	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/cd-dir/boot32
+	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/cd-dir/boot64
 	umount ${.OBJDIR}/cd-dir
 	@df /dev/svnd0a
 	vnconfig -u svnd0
@@ -35,9 +42,9 @@ ${CDROM}:
 	vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
 	# boot32 needs 77, boot64 needs 173, and add some room for growth
 	/usr/mdec/sgivol -i -h 320 svnd0 > ${.OBJDIR}/volhdr
-	/usr/mdec/sgivol -w boot32 ${.OBJDIR}/boot32 svnd0
+	/usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 svnd0
 	/usr/mdec/sgivol -l boot32 sashARCS svnd0
-	/usr/mdec/sgivol -w boot64 ${.OBJDIR}/boot64 svnd0
+	/usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 svnd0
 	/usr/mdec/sgivol -l boot64 sash64 svnd0
 	vnconfig -u svnd0
 	dd if=${.OBJDIR}/${FFS} of=${.OBJDIR}/${CDROM} bs=512 \
@@ -54,7 +61,7 @@ unconfig:
 	-vnconfig -u svnd0
 
 clean cleandir:
-	/bin/rm -f ${CDROM} ${CDROM2} ${FFS} volhdr bsd boot
+	/bin/rm -f ${CDROM} ${FFS} volhdr
 	rm -rf cd-dir
 
 .include <bsd.obj.mk>
diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index 85f2ca6e7ef..65ee35a4dba 100644
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 2009/05/23 18:20:37 miod Exp $
+#	$OpenBSD: Makefile,v 1.12 2009/05/30 04:01:29 miod Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -11,7 +11,9 @@ RELDIR?=	/home/rel-${MACHINE}
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
-		${RELDIR}/bsd ${RELDIR}/bsd.rd \
+		${RELDIR}/bsd.IP27 ${RELDIR}/bsd.rd.IP27 \
+		${RELDIR}/bsd.IP30 ${RELDIR}/bsd.rd.IP30 \
+		${RELDIR}/bsd.IP32 ${RELDIR}/bsd.rd.IP32 \
 		${RELDIR}/INSTALL.${MACHINE}
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
 		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
@@ -29,17 +31,13 @@ ${CDROM}:
 	-rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/
 
-	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/boot32
-	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/boot64
-	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD} > ${.OBJDIR}/bsd
-
 	dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=2048b count=224
 	vnconfig -v -c -t cdroot svnd0 ${.OBJDIR}/${CDROM}
 
 	/usr/mdec/sgivol -i -h 80 svnd0
-	/usr/mdec/sgivol -w boot32 ${.OBJDIR}/boot32 svnd0
+	/usr/mdec/sgivol -w boot32 ${DESTDIR}/usr/mdec/boot32 svnd0
 	/usr/mdec/sgivol -l boot32 sashARCS svnd0
-	/usr/mdec/sgivol -w boot64 ${.OBJDIR}/boot64 svnd0
+	/usr/mdec/sgivol -w boot64 ${DESTDIR}/usr/mdec/boot64 svnd0
 	/usr/mdec/sgivol -l boot64 sash64 svnd0
 
 	disklabel -w svnd0 cdroot "OpenBSD/sgi     "
@@ -47,13 +45,17 @@ ${CDROM}:
 	mount /dev/svnd0a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp ${.OBJDIR}/bsd ${.OBJDIR}/cd-dir/bsd
-	ln ${.OBJDIR}/cd-dir/bsd ${.OBJDIR}/cd-dir/bsd.rd
-	cp ${.OBJDIR}/boot32 ${.OBJDIR}/cd-dir/boot32
-	ln ${.OBJDIR}/boot32 ${.OBJDIR}/cd-dir/boot-IP32
-	cp ${.OBJDIR}/boot64 ${.OBJDIR}/cd-dir/boot64
-	ln ${.OBJDIR}/boot64 ${.OBJDIR}/cd-dir/boot-IP27
-	ln ${.OBJDIR}/boot64 ${.OBJDIR}/cd-dir/boot-IP30
+	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP27> \
+	    ${.OBJDIR}/cd-dir/bsd.rd.IP27
+	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP30> \
+	    ${.OBJDIR}/cd-dir/bsd.rd.IP30
+	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP32> \
+	    ${.OBJDIR}/cd-dir/bsd.rd.IP32
+	cp ${DESTDIR}/usr/mdec/boot32 ${.OBJDIR}/cd-dir/boot32
+	cp ${DESTDIR}/usr/mdec/boot64 ${.OBJDIR}/cd-dir/boot64
+	ln ${.OBJDIR}/cd-dir/boot64 ${.OBJDIR}/cd-dir/boot-IP27
+	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}
 	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
@@ -75,7 +77,7 @@ unconfig:
 	-vnconfig -u svnd0
 
 clean cleandir:
-	/bin/rm -f ${CDROM} bsd boot32 boot64 boot-IP27 boot-IP30 boot-IP32
+	/bin/rm -f ${CDROM}
 	rm -rf cd-dir
 
 .include <bsd.obj.mk>
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index a1d0302db64..7d73cfc4c02 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2009/05/14 21:16:38 miod Exp $
+#	$OpenBSD: Makefile,v 1.11 2009/05/30 04:01:29 miod Exp $
 
 REV=		${OSrev}
 
@@ -33,21 +33,47 @@ all ${IMAGE}:
 	@false
 .else
 
-all:	${BSD_RD}
+all:	${BSD_RD}.IP27 ${BSD_RD}.IP30 ${BSD_RD}.IP32
 
-${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
-	cp bsd bsd.rd
-	${.OBJDIR}/rdsetroot ${BSD_RD} ${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:
+bsd.IP27:
+.ifndef NOBUILD
+	cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP27
+	cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP27 && \
+	    ${MAKE} clean && ${MAKE} depend && ${MAKE}
+.endif
+	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP27/bsd bsd.IP27
+
+bsd.IP30:
+.ifndef NOBUILD
+	cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP30
+	cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP30 && \
+	    ${MAKE} clean && ${MAKE} depend && ${MAKE}
+.endif
+	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP30/bsd bsd.IP30
+
+bsd.IP32:
+.ifndef NOBUILD
 	cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP32
 	cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP32 && \
 	    ${MAKE} clean && ${MAKE} depend && ${MAKE}
-	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP32/bsd bsd
+.endif
+	cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP32/bsd bsd.IP32
 
 rd_setup: 
 	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
@@ -89,11 +115,14 @@ do_files:
 
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
-	*.o *.lo *.c bsd ${BSD_RD} rdsetroot
+	    bsd.IP27 ${BSD_RD}.IP27 \
+	    bsd.IP30 ${BSD_RD}.IP30 \
+	    bsd.IP32 ${BSD_RD}.IP32 \
+	    *.o *.lo *.c rdsetroot
 
 .ifdef RELEASEDIR
 install:
-	cp ${BSD_RD} ${RELEASEDIR}
+	cp ${BSD_RD}.IP27 ${BSD_RD}.IP30 ${BSD_RD}.IP32 ${RELEASEDIR}
 .endif
 
 .include <bsd.obj.mk>
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md
index 6e87b1b616b..243eba119ed 100644
--- a/distrib/sgi/ramdisk/install.md
+++ b/distrib/sgi/ramdisk/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.17 2009/05/18 20:57:27 miod Exp $
+#	$OpenBSD: install.md,v 1.18 2009/05/30 04:01:29 miod Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -33,8 +33,20 @@
 #
 
 ARCH=ARCH
+IPARCH=`sysctl -n hw.model`
+
+MDSETS="bsd.${IPARCH} bsd.rd.${IPARCH}"
+DEFAULTSETS=${MDSETS}
+SANESETS="bsd.${IPARCH}"
 
 md_installboot() {
+	cd /mnt
+	if [[ -f bsd.${IPARCH} ]]; then
+		mv bsd.${IPARCH} bsd
+	fi
+	if [[ -f bsd.rd.${IPARCH} ]]; then
+		mv bsd.rd.${IPARCH} bsd.rd
+	fi
 }
 
 md_prep_disklabel()
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index 94214b843c6..e37909eb659 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.22 2009/05/21 13:21:33 miod Exp $
+#	$OpenBSD: list,v 1.23 2009/05/30 04:01:29 miod Exp $
 
 SRCDIRS distrib/special
 SRCDIRS bin sbin usr.bin usr.sbin
@@ -91,4 +91,4 @@ SCRIPT	${CURDIR}/../../miniroot/install.sh	install
 SCRIPT	${CURDIR}/../../miniroot/install.sub	install.sub
 SPECIAL	chmod 755 install upgrade sbin/dhclient-script
 
-HASH	var/hash
+HASH	var/hash	bsd.IP27 bsd.IP30 bsd.IP32