From 5dd6693718af6210339b9e01e04ef453876ce5fd Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 21 Jul 2001 17:32:40 +0000
Subject: [PATCH] Unconditionalize these now that they live in ARCH-specific
 directories.

---
 release/alpha/dokern.sh | 114 ----------------------------------------
 release/amd64/dokern.sh |  61 ---------------------
 release/i386/dokern.sh  |  61 ---------------------
 release/pc98/dokern.sh  |  61 ---------------------
 4 files changed, 297 deletions(-)

diff --git a/release/alpha/dokern.sh b/release/alpha/dokern.sh
index 572ad5de835b..9d82335170a5 100755
--- a/release/alpha/dokern.sh
+++ b/release/alpha/dokern.sh
@@ -3,119 +3,6 @@
 # $FreeBSD$
 #
 
-if [ $# -lt 1 ]; then
-	FDSIZE=NORMAL
-else
-	FDSIZE=$1
-fi
-
-ARCH="`uname -m`"
-
-# First check for the standard x86 PC class.
-if [ "${ARCH}" = "i386" ]; then
-
-if [ "${FDSIZE}" = "SMALL" ]; then
-
-sed	-e '/	pci$/d' \
-	-e '/	adv/d' \
-	-e '/	ahc/d' \
-	-e '/	amd/d' \
-	-e '/	isp/d' \
-	-e '/	ncr/d' \
-	-e '/	sym/d' \
-	-e '/	de/d' \
-	-e '/	fxp/d' \
-	-e '/	tx/d' \
-	-e '/	vx/d' \
-	-e '/	wx/d' \
-	-e '/	dc/d' \
-	-e '/	pcn/d' \
-	-e '/	rl/d' \
-	-e '/	sf/d' \
-	-e '/	sis/d' \
-	-e '/	ste/d' \
-	-e '/	tl/d' \
-	-e '/	vr/d' \
-	-e '/	wb/d' \
-	-e '/	xl/d' \
-	-e '/pty/d' \
-	-e '/pass/d' \
-	-e '/	apm/d' \
-	-e '/pmtimer/d' \
-	-e '/ppp/d' \
-	-e '/gif/d' \
-	-e '/faith/d' \
-	-e '/gzip/d' \
-	-e '/random/d' \
-	-e '/splash/d' \
-	-e '/PROCFS/d' \
-	-e '/KTRACE/d' \
-	-e '/SYSVMSG/d' \
-	-e '/SOFTUPDATES/d' \
-	-e '/MFS/d' \
-	-e '/NFS_ROOT/d' \
-	-e '/DEBUG/d' \
-	-e '/DDB/d' \
-	-e '/INVARIANTS/d' \
-	-e '/INVARIANT_SUPPORT/d' \
-	-e '/WITNESS/d' \
-	-e '/pcm/d' \
-	-e '/atapist/d' \
-	-e '/ugen/d' \
-	-e '/uhid/d' \
-	-e '/ulpt/d' \
-	-e '/urio/d' \
-	-e '/uscanner/d' \
-	-e '/maxusers/d' \
-	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
-
-else
-
-sed	-e '/pty/d' \
-	-e '/pass/d' \
-	-e '/	apm/d' \
-	-e '/pmtimer/d' \
-	-e '/ppp/d' \
-	-e '/gif/d' \
-	-e '/faith/d' \
-	-e '/gzip/d' \
-	-e '/random/d' \
-	-e '/splash/d' \
-	-e '/PROCFS/d' \
-	-e '/KTRACE/d' \
-	-e '/SYSVMSG/d' \
-	-e '/SOFTUPDATES/d' \
-	-e '/MFS/d' \
-	-e '/NFS_ROOT/d' \
- 	-e '/DEBUG/d' \
- 	-e '/DDB/d' \
- 	-e '/INVARIANTS/d' \
- 	-e '/INVARIANT_SUPPORT/d' \
- 	-e '/WITNESS/d' \
-	-e '/	ncr/d' \
-	-e '/pcm/d' \
-	-e '/atapist/d' \
-	-e '/wds/d' \
-	-e '/lpt/d' \
-	-e '/ppi/d' \
-	-e '/ugen/d' \
-	-e '/uhid/d' \
-	-e '/ulpt/d' \
-	-e '/urio/d' \
-	-e '/uscanner/d' \
-	-e '/maxusers/d' \
-	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
-
-fi
-
-echo "options  NETGRAPH"
-echo "options  NETGRAPH_ETHER"
-echo "options  NETGRAPH_PPPOE"
-echo "options  NETGRAPH_SOCKET"
-
-# Otherwise maybe it's an alpha, and it has big binaries.
-elif [ "${ARCH}" = "alpha" ]; then
-
 sed	\
 	-e '/DEC_3000_300/d' \
 	-e '/DEC_3000_500/d' \
@@ -167,7 +54,6 @@ sed	\
 	-e '/kue/d' \
 	-e '/maxusers/d' \
 	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
-fi
 
 # reset maxusers to something lower
 echo "maxusers	5"
diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh
index 572ad5de835b..e71778e4d95b 100755
--- a/release/amd64/dokern.sh
+++ b/release/amd64/dokern.sh
@@ -9,11 +9,6 @@ else
 	FDSIZE=$1
 fi
 
-ARCH="`uname -m`"
-
-# First check for the standard x86 PC class.
-if [ "${ARCH}" = "i386" ]; then
-
 if [ "${FDSIZE}" = "SMALL" ]; then
 
 sed	-e '/	pci$/d' \
@@ -113,62 +108,6 @@ echo "options  NETGRAPH_ETHER"
 echo "options  NETGRAPH_PPPOE"
 echo "options  NETGRAPH_SOCKET"
 
-# Otherwise maybe it's an alpha, and it has big binaries.
-elif [ "${ARCH}" = "alpha" ]; then
-
-sed	\
-	-e '/DEC_3000_300/d' \
-	-e '/DEC_3000_500/d' \
-	-e '/SOFTUPDATES/d' \
-	-e '/MFS/d' \
-	-e '/NFS_ROOT/d' \
-	-e '/MSDOSFS/d' \
-	-e '/PROCFS/d' \
-	-e '/KTRACE/d' \
-	-e '/SYSV/d' \
-	-e '/P1003_1B/d' \
-	-e '/_KPOSIX_PRIORITY_SCHEDULING/d' \
- 	-e '/DEBUG/d' \
- 	-e '/DDB/d' \
- 	-e '/INVARIANTS/d' \
- 	-e '/INVARIANT_SUPPORT/d' \
- 	-e '/WITNESS/d' \
-	-e '/atapist/d' \
-	-e '/	ncr/d' \
-	-e '/pass/d' \
-	-e '/splash/d' \
-	-e '/	apm/d' \
-	-e '/pmtimer/d' \
-	-e '/pcm/d' \
-	-e '/lpt/d' \
-	-e '/ppi/d' \
-	-e '/vpo/d' \
-	-e '/	le	/d' \
-	-e '/random/d' \
-	-e '/gzip/d' \
-	-e '/	sl	/d' \
-	-e '/ppp/d' \
-	-e '/pty/d' \
-	-e '/gif/d' \
-	-e '/faith/d' \
-	-e '/uhci/d' \
-	-e '/ohci/d' \
-	-e '/usb/d' \
-	-e '/ugen/d' \
-	-e '/uhid/d' \
-	-e '/ukbd/d' \
-	-e '/ulpt/d' \
-	-e '/umass/d' \
-	-e '/ums/d' \
-	-e '/urio/d' \
-	-e '/uscanner/d' \
-	-e '/aue/d' \
-	-e '/cue/d' \
-	-e '/kue/d' \
-	-e '/maxusers/d' \
-	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
-fi
-
 # reset maxusers to something lower
 echo "maxusers	5"
 
diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh
index 572ad5de835b..e71778e4d95b 100755
--- a/release/i386/dokern.sh
+++ b/release/i386/dokern.sh
@@ -9,11 +9,6 @@ else
 	FDSIZE=$1
 fi
 
-ARCH="`uname -m`"
-
-# First check for the standard x86 PC class.
-if [ "${ARCH}" = "i386" ]; then
-
 if [ "${FDSIZE}" = "SMALL" ]; then
 
 sed	-e '/	pci$/d' \
@@ -113,62 +108,6 @@ echo "options  NETGRAPH_ETHER"
 echo "options  NETGRAPH_PPPOE"
 echo "options  NETGRAPH_SOCKET"
 
-# Otherwise maybe it's an alpha, and it has big binaries.
-elif [ "${ARCH}" = "alpha" ]; then
-
-sed	\
-	-e '/DEC_3000_300/d' \
-	-e '/DEC_3000_500/d' \
-	-e '/SOFTUPDATES/d' \
-	-e '/MFS/d' \
-	-e '/NFS_ROOT/d' \
-	-e '/MSDOSFS/d' \
-	-e '/PROCFS/d' \
-	-e '/KTRACE/d' \
-	-e '/SYSV/d' \
-	-e '/P1003_1B/d' \
-	-e '/_KPOSIX_PRIORITY_SCHEDULING/d' \
- 	-e '/DEBUG/d' \
- 	-e '/DDB/d' \
- 	-e '/INVARIANTS/d' \
- 	-e '/INVARIANT_SUPPORT/d' \
- 	-e '/WITNESS/d' \
-	-e '/atapist/d' \
-	-e '/	ncr/d' \
-	-e '/pass/d' \
-	-e '/splash/d' \
-	-e '/	apm/d' \
-	-e '/pmtimer/d' \
-	-e '/pcm/d' \
-	-e '/lpt/d' \
-	-e '/ppi/d' \
-	-e '/vpo/d' \
-	-e '/	le	/d' \
-	-e '/random/d' \
-	-e '/gzip/d' \
-	-e '/	sl	/d' \
-	-e '/ppp/d' \
-	-e '/pty/d' \
-	-e '/gif/d' \
-	-e '/faith/d' \
-	-e '/uhci/d' \
-	-e '/ohci/d' \
-	-e '/usb/d' \
-	-e '/ugen/d' \
-	-e '/uhid/d' \
-	-e '/ukbd/d' \
-	-e '/ulpt/d' \
-	-e '/umass/d' \
-	-e '/ums/d' \
-	-e '/urio/d' \
-	-e '/uscanner/d' \
-	-e '/aue/d' \
-	-e '/cue/d' \
-	-e '/kue/d' \
-	-e '/maxusers/d' \
-	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
-fi
-
 # reset maxusers to something lower
 echo "maxusers	5"
 
diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh
index 572ad5de835b..e71778e4d95b 100755
--- a/release/pc98/dokern.sh
+++ b/release/pc98/dokern.sh
@@ -9,11 +9,6 @@ else
 	FDSIZE=$1
 fi
 
-ARCH="`uname -m`"
-
-# First check for the standard x86 PC class.
-if [ "${ARCH}" = "i386" ]; then
-
 if [ "${FDSIZE}" = "SMALL" ]; then
 
 sed	-e '/	pci$/d' \
@@ -113,62 +108,6 @@ echo "options  NETGRAPH_ETHER"
 echo "options  NETGRAPH_PPPOE"
 echo "options  NETGRAPH_SOCKET"
 
-# Otherwise maybe it's an alpha, and it has big binaries.
-elif [ "${ARCH}" = "alpha" ]; then
-
-sed	\
-	-e '/DEC_3000_300/d' \
-	-e '/DEC_3000_500/d' \
-	-e '/SOFTUPDATES/d' \
-	-e '/MFS/d' \
-	-e '/NFS_ROOT/d' \
-	-e '/MSDOSFS/d' \
-	-e '/PROCFS/d' \
-	-e '/KTRACE/d' \
-	-e '/SYSV/d' \
-	-e '/P1003_1B/d' \
-	-e '/_KPOSIX_PRIORITY_SCHEDULING/d' \
- 	-e '/DEBUG/d' \
- 	-e '/DDB/d' \
- 	-e '/INVARIANTS/d' \
- 	-e '/INVARIANT_SUPPORT/d' \
- 	-e '/WITNESS/d' \
-	-e '/atapist/d' \
-	-e '/	ncr/d' \
-	-e '/pass/d' \
-	-e '/splash/d' \
-	-e '/	apm/d' \
-	-e '/pmtimer/d' \
-	-e '/pcm/d' \
-	-e '/lpt/d' \
-	-e '/ppi/d' \
-	-e '/vpo/d' \
-	-e '/	le	/d' \
-	-e '/random/d' \
-	-e '/gzip/d' \
-	-e '/	sl	/d' \
-	-e '/ppp/d' \
-	-e '/pty/d' \
-	-e '/gif/d' \
-	-e '/faith/d' \
-	-e '/uhci/d' \
-	-e '/ohci/d' \
-	-e '/usb/d' \
-	-e '/ugen/d' \
-	-e '/uhid/d' \
-	-e '/ukbd/d' \
-	-e '/ulpt/d' \
-	-e '/umass/d' \
-	-e '/ums/d' \
-	-e '/urio/d' \
-	-e '/uscanner/d' \
-	-e '/aue/d' \
-	-e '/cue/d' \
-	-e '/kue/d' \
-	-e '/maxusers/d' \
-	-e 's/ident.*GENERIC/ident		BOOTMFS/g'
-fi
-
 # reset maxusers to something lower
 echo "maxusers	5"