summaryrefslogtreecommitdiff
path: root/distrib/sgi
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-03-29 20:27:54 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-03-29 20:27:54 +0000
commitad59a90e51e8f6a202fd8c12683442ba539198da (patch)
tree44fc6abbaf51d1bd4ac5eee17ae8dcf601da26c2 /distrib/sgi
parentda68251c5815765c551e0447d833dc59a237da31 (diff)
Hook IP22 kernels to the build, and document how to boot the installation
media on them. Try to be helpful and explain how things may fail on the older PROM and what to do about this.
Diffstat (limited to 'distrib/sgi')
-rw-r--r--distrib/sgi/ramdisk/Makefile20
-rw-r--r--distrib/sgi/ramdisk/list6
2 files changed, 21 insertions, 5 deletions
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index 5569eddf3a8..545f5d5f453 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/07/09 00:42:49 drahn Exp $
+# $OpenBSD: Makefile,v 1.17 2012/03/29 20:27:53 miod Exp $
REV= ${OSrev}
@@ -33,7 +33,11 @@ all ${IMAGE}:
@false
.else
-all: ${BSD_RD}.IP27 ${BSD_RD}.IP30 ${BSD_RD}.IP32
+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
@@ -51,6 +55,14 @@ ${IMAGE}: rd_setup do_files rd_teardown
.endif
+bsd.IP22:
+.ifndef NOBUILD
+ cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP22
+ cd ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP22 && \
+ ${MAKE} clean && exec ${MAKE}
+.endif
+ cp ${.TOP}/../../sys/arch/sgi/compile/RAMDISK-IP22/bsd bsd.IP22
+
bsd.IP27:
.ifndef NOBUILD
cd ${.TOP}/../../sys/arch/sgi/conf && config RAMDISK-IP27
@@ -117,6 +129,7 @@ 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 \
@@ -124,7 +137,8 @@ clean cleandir:
.ifdef RELEASEDIR
install:
- cp ${BSD_RD}.IP27 ${BSD_RD}.IP30 ${BSD_RD}.IP32 ${RELEASEDIR}
+ cp ${BSD_RD}.IP22 ${BSD_RD}.IP27 ${BSD_RD}.IP30 ${BSD_RD}.IP32 \
+ ${RELEASEDIR}
.endif
.include <bsd.obj.mk>
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index f26789359bb..fb1a4c8121e 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.30 2011/08/02 01:14:28 deraadt Exp $
+# $OpenBSD: list,v 1.31 2012/03/29 20:27:53 miod Exp $
SRCDIRS distrib/special
SRCDIRS bin sbin usr.bin usr.sbin
@@ -66,6 +66,8 @@ 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-IP30
+COPY ${DESTDIR}/usr/mdec/bootecoff usr/mdec/bootecoff
+SYMLINK /usr/mdec/bootecoff usr/mdec/boot-IP22
COPY ${DESTDIR}/usr/mdec/sgivol usr/mdec/sgivol
# various files that we need in /etc for the install
@@ -99,5 +101,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.IP27 bsd.IP30 bsd.mp.IP30 bsd.IP32
+HASH var/hash bsd.IP22 bsd.IP27 bsd.IP30 bsd.mp.IP30 bsd.IP32
TZ