From f3749113568ba4ba4688817ba4afb44a61d42ea7 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Wed, 15 Jun 2011 21:36:50 +0000
Subject: [PATCH] Stop providing a bsd.scsi3 kernel on sparc. If you have a
 system with multiple disks and scsi id#3 as the boot device, by all means,
 use DUIDs to mount your filesystems and it won't matter what sd unit number
 the boot disk attaches with.

---
 src/etc/etc.sparc/Makefile.inc | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/etc/etc.sparc/Makefile.inc b/src/etc/etc.sparc/Makefile.inc
index 8c03ae42..a88fc064 100644
--- a/src/etc/etc.sparc/Makefile.inc
+++ b/src/etc/etc.sparc/Makefile.inc
@@ -1,12 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.19 2011/04/15 03:11:38 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.20 2011/06/15 21:36:50 miod Exp $
 
 kernels: bsd bootblocks
 	cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \
 	    ${RELEASEDIR}/bsd
-	s=`printf "find sd\nexit" | config -e ${RELEASEDIR}/bsd | \
-	    grep scsibus | awk '{print $$1}'`; \
-	    printf "add sd0\n%s\n%s\nchange %s\ny\n3\n\n\nquit\n" $$s $$s $$s | \
-	    config -e -o ${RELEASEDIR}/bsd.scsi3 ${RELEASEDIR}/bsd
 
 bsd:
 	cd ${.CURDIR}/../sys/arch/sparc/conf && config GENERIC
@@ -18,7 +14,7 @@ bootblocks:
 	${DESTDIR}/usr/mdec/binstall net /tmp && \
 	    mv /tmp/boot.sparc.openbsd ${RELEASEDIR}/boot.net
 
-MDEXT=	bsd bsd.rd bsd.scsi3 cd${OSrev}.iso \
+MDEXT=	bsd bsd.rd cd${OSrev}.iso \
 	floppy${OSrev}.fs miniroot${OSrev}.fs \
 	boot boot.net bootxx installboot