Change kernel set to shorter names on mac68k; supposed to make krw's

next changes easier.

5 files changed, 14 insertions, 15 deletions

diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md
index 44753f5e4be..f56d263e578 100644
--- a/distrib/mac68k/ramdisk/install.md
+++ b/distrib/mac68k/ramdisk/install.md
@@ -1,4 +1,4 @@
-#       $OpenBSD: install.md,v 1.17 2002/09/24 23:45:05 deraadt Exp $
+#       $OpenBSD: install.md,v 1.18 2002/10/30 21:37:40 miod Exp $
 #
 # Copyright (c) 2002, Miodrag Vallat.
 # All rights reserved.
@@ -63,7 +63,7 @@
 #
 
 # Machine-dependent install sets
-MDSETS="bsd-generic bsd-genericsbc"
+MDSETS="bsd bsd-sbc"
 MDTERM=vt100
 ARCH=ARCH
 
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index ef0a1a5e25a..a66e6b2d6b9 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,21 +1,20 @@
-dnl	$OpenBSD: contents,v 1.36 2002/10/07 19:32:00 miod Exp $
+dnl	$OpenBSD: contents,v 1.37 2002/10/30 21:37:40 miod Exp $
 TopPart
 
 OpenBSDdistsets
 
-		bsd-generic.tgz The OpenBSD/MACHINE OSREV kernel binary.
+		bsd.tgz		The OpenBSD/MACHINE OSREV kernel binary.
 				You MUST install either this file or
-				bsd-genericsbic.tgz blow.  It is the kernel
+				bsd-sbc.tgz below. It is the kernel
 				that you need to boot the system.
 
-		bsd-genericsbc.tgz
-				Another OpenBSD/MACHINE OSREV kernel binary.
+		bsd-sbc.tgz	Another OpenBSD/MACHINE OSREV kernel binary.
 				This is identical in every way to
-				bsd-generic.tgz accept that it enables a
+				bsd.tgz except that it enables a
 				different SCSI driver which may allow
 				some otherwise incompatible SCSI disks to
 				function with OpenBSD/MACHINE.  You must
-				install either this or bsd-generic.tgz.
+				install either this or bsd.tgz.
 
 		utils/		The MACHINE installation utilities for MacOS.
 
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index d678dc3d998..56788fe280d 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.20 2002/06/09 05:53:54 todd Exp $
+dnl	$OpenBSD: install,v 1.21 2002/10/30 21:37:40 miod Exp $
 OpenBSDInstallPrelude
 
 The installation can be broken down into four basic steps:
@@ -82,7 +82,7 @@ If you are installing onto a single root partition, proceed to the
 Installation of base files:
 
 	Select the "Install" menu item from the "File" menu and install
-	base{:--:}OSrev.tgz, bsd-generic.tgz, comp{:--:}OSrev.tgz, and any other
+	base{:--:}OSrev.tgz, bsd.tgz, comp{:--:}OSrev.tgz, and any other
 	packages you wish to install at this time (see the contents section
 	for information about what's in each package).  The installer will
 	print out the filename of each file as it is installed and will
diff --git a/distrib/notes/mac68k/upgrade b/distrib/notes/mac68k/upgrade
index 1ca141829f4..eab5fa19777 100644
--- a/distrib/notes/mac68k/upgrade
+++ b/distrib/notes/mac68k/upgrade
@@ -10,4 +10,4 @@ You will then have an etc directory with current system configuration files
 in it.  Use this to carefully upgrade your files in the running /etc and
 reboot the system.  Also, it is highly recommended that when upgrading your
 kernel binary (/bsd) you backup the old, working kernel and extract
-bsd-generic.tgz into / only from OpenBSD.
+bsd.tgz into / only from OpenBSD.
diff --git a/etc/etc.mac68k/Makefile.inc b/etc/etc.mac68k/Makefile.inc
index a7335ed4551..d13073033c8 100644
--- a/etc/etc.mac68k/Makefile.inc
+++ b/etc/etc.mac68k/Makefile.inc
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2002/05/13 07:22:43 espie Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2002/10/30 21:37:37 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-generic.tar${GZIPEXT})
+	 | ${GZIP} ${GZIPFLAGS} >${DESTDIR}/snapshot/bsd.tgz)
 	(cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERICSBC; \
 	 tar cf - bsd \
-	 | ${GZIP} ${GZIPFLAGS} >${DESTDIR}/snapshot/bsd-genericsbc.tar${GZIPEXT})
+	 | ${GZIP} ${GZIPFLAGS} >${DESTDIR}/snapshot/bsd-sbc.tgz)
 bsd-generic:
 	cd ${.CURDIR}/../sys/arch/mac68k/conf && config GENERIC
 	cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \