Now that the rest of the infrastructure is in place, actually create a

working installXX.iso for OpenBSD/sgi!

ok deraadt@

diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index 640c400..6b93adf 100644 (file)
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,11 +1,11 @@
-#      $OpenBSD: Makefile,v 1.6 2008/08/20 18:21:13 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.7 2008/08/25 17:13:25 jsing Exp $
 
 TOP=   ${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
 CDROM=         install${REV}.iso
-RELXDIR=       /home/relx-${MACHINE}
+RELXDIR?=      /home/relx-${MACHINE}
 RELDIR?=       /home/rel-${MACHINE}
 
 BASE=          ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
@@ -18,7 +18,6 @@ XBASE=                ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
                ${RELXDIR}/xserv${OSrev}.tgz
 
 BSDRD= bsd.rd
-FFS=   ffs.img
 all: ${CDROM}
 
 ${CDROM}:
@@ -28,8 +27,15 @@ ${CDROM}:
        objcopy -Sg -R .comment ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/boot
        strip ${.OBJDIR}/boot
        gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD} > ${.OBJDIR}/bsd
-       dd if=/dev/zero of=${.OBJDIR}/${FFS} bs=2048b count=224
-       vnconfig -v -c svnd0 ${.OBJDIR}/${FFS}
+
+       dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=2048b count=224
+       vnconfig -v -c -s 2048 svnd0 ${.OBJDIR}/${CDROM}
+
+       # 22 * 2048 byte sectors = 44KB
+       /usr/mdec/sgivol -i -h 22 svnd0
+       /usr/mdec/sgivol -w boot ${.OBJDIR}/boot svnd0
+       /usr/mdec/sgivol -l boot sashARCS svnd0
+
        disklabel -w svnd0 cdroot "OpenBSD/sgi     "
        newfs /dev/rsvnd0a
        mount /dev/svnd0a ${.OBJDIR}/cd-dir
@@ -43,17 +49,7 @@ ${CDROM}:
        cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
        umount ${.OBJDIR}/cd-dir
-       @df /dev/svnd0a
-       vnconfig -u svnd0
-       dd if=/dev/zero of=${.OBJDIR}/${CDROM} bs=1m count=10
-       vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
-       # would love to use -h 64, but boot is slightly too big
-       /usr/mdec/sgivol -i -h 88 svnd0 > ${.OBJDIR}/volhdr
-       /usr/mdec/sgivol -w boot ${.OBJDIR}/boot svnd0
-       /usr/mdec/sgivol -l boot sashARCS svnd0
        vnconfig -u svnd0
-       dd if=${.OBJDIR}/${FFS} of=${.OBJDIR}/${CDROM} bs=512 \
-           seek=`cat ${.OBJDIR}/volhdr | grep 'Volume Header' | awk '{print $$3}'`
 
 install:
        cp ${CDROM} ${RELDIR}/
@@ -64,7 +60,7 @@ unconfig:
        -vnconfig -u svnd0
 
 clean cleandir:
-       /bin/rm -f ${CDROM} ${FFS} volhdr bsd boot
+       /bin/rm -f ${CDROM} bsd boot
        rm -rf cd-dir
 
 .include <bsd.obj.mk>