From b3aa3d915e56a06e8db49047d563092fbee1654f Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 3 Dec 2004 06:37:51 +0000
Subject: [PATCH] Kill mac68k *SBC kernels. Instead, build kernels with both
 sbc scsi flavours compiled in, but one disabled, and use config -e to swap
 them and build the other kernels; saves valuable compile time.

Add ramdisks into the build (at release time). Since we are moving to a
bsd.rd installation, it is not necessary to put kernels in .tgz files
anymore, so don't bother, and adjust installation script sets information
accordingly.
---
 src/etc/etc.mac68k/Makefile.inc | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/etc/etc.mac68k/Makefile.inc b/src/etc/etc.mac68k/Makefile.inc
index d1307303..b4761c01 100644
--- a/src/etc/etc.mac68k/Makefile.inc
+++ b/src/etc/etc.mac68k/Makefile.inc
@@ -1,23 +1,18 @@
-#	$OpenBSD: Makefile.inc,v 1.8 2002/10/30 21:37:37 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.9 2004/12/03 06:37:51 miod Exp $
 #	etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
 
 .ifdef DESTDIR
-snap_md: bsd-generic bsd-genericsbc
-	(cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC; \
-	 tar cf - bsd \
-	 | ${GZIP} ${GZIPFLAGS} >${DESTDIR}/snapshot/bsd.tgz)
-	(cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERICSBC; \
-	 tar cf - bsd \
-	 | ${GZIP} ${GZIPFLAGS} >${DESTDIR}/snapshot/bsd-sbc.tgz)
-bsd-generic:
+snap_md: bsd distrib
+	cp ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC/bsd \
+	    ${DESTDIR}/snapshot/bsd
+	printf "disable ncrscsi\nenable sbc\nquit" | config -e \
+	    -o ${DESTDIR}/snapshot/bsdsbc ${DESTDIR}/snapshot/bsd
+
+bsd:
 	cd ${.CURDIR}/../sys/arch/mac68k/conf && config GENERIC
 	cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \
 	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
-bsd-genericsbc:
-	cd ${.CURDIR}/../sys/arch/mac68k/conf && config GENERICSBC
-	cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERICSBC && \
-	    ${MAKE} clean && ${MAKE} depend && exec ${MAKE}
 
-.PHONY: bsd-generic bsd-genericsbc
+.PHONY: bsd
 
 .endif	# DESTDIR check