summaryrefslogtreecommitdiff
path: root/distrib/sgi
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-03-31 19:44:36 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-03-31 19:44:36 +0000
commit294102cc36f58535b618cfa97ca80dd1461dc030 (patch)
tree14ec7c3c6d6fca1c685001d98c03d1f125ef4ea2 /distrib/sgi
parent86522847c512d0f481c13afd50a8e1884a8551fa (diff)
Add bnx firmware on installation media; this causes a media oflow, so
enlarge bsd.rd filesystem; this in turn causes a cd oflow, so enlarge cd filesystem. ok jsing@ deraadt@
Diffstat (limited to 'distrib/sgi')
-rw-r--r--distrib/sgi/cdfs/Makefile8
-rw-r--r--distrib/sgi/ramdisk/Makefile4
-rw-r--r--distrib/sgi/ramdisk/list7
3 files changed, 13 insertions, 6 deletions
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index fb7d9e55bcf..70d37e2c127 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2009/05/30 04:01:27 miod Exp $
+# $OpenBSD: Makefile,v 1.10 2010/03/31 19:44:33 miod Exp $
TOP= ${.CURDIR}/..
@@ -7,12 +7,14 @@ TOP= ${.CURDIR}/..
BSDRD= bsd.rd
CDROM= cd${REV}.iso
FFS= ffs.img
+# must match the size of `minicdroot' in disktab
+CDFSMB= 10
all: ${CDROM}
${CDROM}:
-rm -rf ${.OBJDIR}/cd-dir
mkdir -p ${.OBJDIR}/cd-dir/
- dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=1m count=8
+ dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=1m count=${CDFSMB}
vnconfig -v -c svnd0 ${.OBJDIR}/${FFS}
disklabel -w svnd0 minicdroot "OpenBSD/sgi "
newfs /dev/rsvnd0a
@@ -38,7 +40,7 @@ ${CDROM}:
umount ${.OBJDIR}/cd-dir
@df /dev/svnd0a
vnconfig -u svnd0
- dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=10
+ dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=`expr ${CDFSMB} + 2`
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
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index 7d73cfc4c02..b137487d8b7 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2009/05/30 04:01:29 miod Exp $
+# $OpenBSD: Makefile,v 1.12 2010/03/31 19:44:35 miod Exp $
REV= ${OSrev}
@@ -23,7 +23,7 @@ PID!= echo $$$$
DISKTYPE= rdroot
-NBLKS= 8192
+NBLKS= 10240
# minfree, opt, b/i trks, sects, cpg
NEWFSARGS= -m 0 -o space -i 4096
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index daf64aa9662..5c1995db8f7 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.26 2010/03/31 17:51:42 deraadt Exp $
+# $OpenBSD: list,v 1.27 2010/03/31 19:44:35 miod Exp $
SRCDIRS distrib/special
SRCDIRS bin sbin usr.bin usr.sbin
@@ -81,6 +81,11 @@ TERMCAP vt100,vt220,dumb usr/share/misc/termcap
# firmwares that might need loading
#COPY ${DESTDIR}/etc/firmware/tigon1 etc/firmware/tigon1
#COPY ${DESTDIR}/etc/firmware/tigon2 etc/firmware/tigon2
+COPY ${DESTDIR}/etc/firmware/bnx-b06 etc/firmware/bnx-b06
+COPY ${DESTDIR}/etc/firmware/bnx-b09 etc/firmware/bnx-b09
+COPY ${DESTDIR}/etc/firmware/bnx-rv2p etc/firmware/bnx-rv2p
+COPY ${DESTDIR}/etc/firmware/bnx-xi-rv2p etc/firmware/bnx-xi-rv2p
+COPY ${DESTDIR}/etc/firmware/bnx-xi90-rv2p etc/firmware/bnx-xi90-rv2p
# dhcp things
SCRIPT ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script