--HcAYCG3uE/tztfnV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, May 18, 2004 at 01:08:26PM +1000, J Lachlan Kanaley wrote:
> Geez, that was quick!  cheers!
> Unfortunately I can't get the first patch to apply cleanly though.
> The second applies no worries.

Hi again, Lachlan,

since etc/etc.sgimips/Makefile.inc hasn't changed in the trees in
6 months, I'll just attach it here for you.

Please let me know how this goes for you.

Regards,
-scott

--HcAYCG3uE/tztfnV
Content-Type: text/plain; charset=us-ascii
Content-Description: Makefile.inc
Content-Disposition: attachment; filename="Makefile.inc"

#	$NetBSD: Makefile.inc,v 1.9 2003/11/15 08:58:27 sekiya Exp $
#
#	etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
#

KERNEL_SETS=		GENERIC32_IP2x GENERIC32_IP3x
KERNEL_SUFFIXES=	ecoff

#EXTRA_KERNELS=		NETBOOT

BUILD_KERNELS=		INSTALL32_IP2x INSTALL32_IP3x

INSTALLATION_DIRS+=	installation/netboot \
			installation/diskimage

SGI.image= ${RELEASEDIR}/${MACHINE}/installation/cdrom/netbsd-sgimips.img

THISHOSTSYS!= uname -s

# Set up vnode/memory-disk port-specific stuff

# Default to NetBSD
VDEV=		vnd0
VDEVF=		r${VDEV}d
VDEVCREATE=	vnconfig ${VDEV} ${SGI.image}
VDEVDESTROY=	vnconfig -u ${VDEV}
VDEVLABEL=	:

.if ${THISHOSTSYS} == "FreeBSD"
FREEBSDTYPE!=	which mdconfig
.if ${FREEBSDTYPE} == ""
# FreeBSD 4.x and prior
VDEV=		vn0
VDEVF=		r${VDEV}c
VDEVCREATE=	vnconfig -s labels -c ${VDEV} ${SGI.image}
VDEVLABEL=	disklabel -w -r ${VDEV} auto
.else
# FreeBSD 5.x and later
VDEV=		md0
VDEVF=		${VDEV}c
VDEVCREATE=	mdconfig -a -t vnode -u ${VDEV} -f ${SGI.image}
VDEVDESTROY=	mdconfig -d -u ${VDEV}
# FreeBSD 5 bsdlabel requires "-m i386" on platforms other than i386
# otherwise, disk block zero cannot be written to.  On the alpha,
# FreeBSD's bsdlabel will even fail with a floating exception without
# it.
VDEVLABEL=	bsdlabel -m i386 -w -r ${VDEV} auto
.endif
.endif

iso-image-md-pre:
	gzip -d -c ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP2x.gz > ${RELEASEDIR}/ip2x
	gzip -d -c ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP3x.gz > ${RELEASEDIR}/ip3x
	echo "ip2x=${RELEASEDIR}/ip2x" >> ${CDROM.pathlist}
	echo "ip3x=${RELEASEDIR}/ip3x" >> ${CDROM.pathlist}

iso-image-md-post:
	dd if=/dev/zero of=${SGI.image} bs=1m count=120

	${VDEVCREATE}
	${VDEVLABEL}

	${TOOLDIR}/bin/nbsgivol -f -i ${VDEVF}
	${TOOLDIR}/bin/nbsgivol -f -w aoutboot ${DESTDIR}/usr/mdec/aoutboot ${VDEVF}
	${TOOLDIR}/bin/nbsgivol -f -w ip2xboot ${DESTDIR}/usr/mdec/ip2xboot ${VDEVF}
	${TOOLDIR}/bin/nbsgivol -f -w ip3xboot ${DESTDIR}/usr/mdec/ip3xboot ${VDEVF}

	${VDEVDESTROY}

	dd if=${CDROM.image} of=${SGI.image} bs=512 seek=3135
	mv ${SGI.image} ${CDROM.image}
	rm -f ${RELEASEDIR}/ip2x ${RELEASEDIR}/ip3x

--HcAYCG3uE/tztfnV--