From 1825309d726664d0bd6dc4574d74d2d84f240722 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Wed, 6 Jan 1999 13:55:14 +0000 Subject: [PATCH] Remove some remaining references to LKM's. Snaps were trying to unpack slkm* etc, among other things. --- release/Makefile | 8 +------- release/scripts/src-install.sh | 4 ++-- release/sysinstall/dist.c | 3 +-- release/sysinstall/dist.h | 2 +- release/sysinstall/install.cfg | 2 +- release/sysinstall/menus.c | 4 +--- release/sysinstall/sysinstall.8 | 4 +--- usr.sbin/sade/menus.c | 4 +--- usr.sbin/sade/sade.8 | 4 +--- usr.sbin/sysinstall/dist.c | 3 +-- usr.sbin/sysinstall/dist.h | 2 +- usr.sbin/sysinstall/install.cfg | 2 +- usr.sbin/sysinstall/menus.c | 4 +--- usr.sbin/sysinstall/sysinstall.8 | 4 +--- 14 files changed, 15 insertions(+), 35 deletions(-) diff --git a/release/Makefile b/release/Makefile index 1fec400fe6a1..86d7b4d24c08 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.446 1999/01/05 03:53:14 jkh Exp $ +# $Id: Makefile,v 1.447 1999/01/05 17:03:49 jkh Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -285,12 +285,6 @@ release.2: make obj all help-distribute DISTDIR=${RD}/trees &&\ make kprog \ ) -.endif - # XXX until lkm and gets populated again by some other means -.if ${MACHINE_ARCH} == "i386" - cd ${.CURDIR}/.. && OBJFORMAT=aout MAKEOBJDIRPREFIX=/usr/obj/aout \ - NOTOOLS=1 NOSECURE=1 NOCRYPT=1 \ - make -f Makefile.inc1 legacy-install DESTDIR=${RD}/trees/bin .endif chflags -R noschg ${RD}/trees touch release.2 diff --git a/release/scripts/src-install.sh b/release/scripts/src-install.sh index 8905d025996a..2ed098fc52e0 100755 --- a/release/scripts/src-install.sh +++ b/release/scripts/src-install.sh @@ -8,7 +8,7 @@ if [ $# -lt 1 ]; then echo "You must specify which components of src to extract" echo "possible subcomponents are:" echo - echo "base bin contrib etc games gnu include lib libexec lkm" + echo "base bin contrib etc games gnu include lib libexec" echo "release sbin share sys ubin usbin" echo echo "You may also specify all to extract all subcomponents." @@ -16,7 +16,7 @@ if [ $# -lt 1 ]; then fi if [ "$1" = "all" ]; then - dists="base bin contrib etc games gnu include lib libexec lkm release sbin share sys ubin usbin" + dists="base bin contrib etc games gnu include lib libexec release sbin share sys ubin usbin" else dists="$*" fi diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index ec22ea50dc55..d84c6ef5331a 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.130 1998/11/15 09:06:19 jkh Exp $ + * $Id: dist.c,v 1.131 1998/11/27 00:30:10 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -101,7 +101,6 @@ static Distribution SrcDistTable[] = { { "sinclude", "/usr/src", &SrcDists, DIST_SRC_INCLUDE, NULL }, { "slib", "/usr/src", &SrcDists, DIST_SRC_LIB, NULL }, { "slibexec", "/usr/src", &SrcDists, DIST_SRC_LIBEXEC, NULL }, -{ "slkm", "/usr/src", &SrcDists, DIST_SRC_LKM, NULL }, { "srelease", "/usr/src", &SrcDists, DIST_SRC_RELEASE, NULL }, { "sbin", "/usr/src", &SrcDists, DIST_SRC_BIN, NULL }, { "ssbin", "/usr/src", &SrcDists, DIST_SRC_SBIN, NULL }, diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h index 9418a5cdd013..19efb223faec 100644 --- a/release/sysinstall/dist.h +++ b/release/sysinstall/dist.h @@ -43,7 +43,7 @@ #define DIST_SRC_INCLUDE 0x00020 #define DIST_SRC_LIB 0x00040 #define DIST_SRC_LIBEXEC 0x00080 -#define DIST_SRC_LKM 0x00100 +/* 0x00100 */ #define DIST_SRC_RELEASE 0x00200 #define DIST_SRC_SBIN 0x00400 #define DIST_SRC_SHARE 0x00800 diff --git a/release/sysinstall/install.cfg b/release/sysinstall/install.cfg index 0949fd3a0fb0..cade7a27ed5f 100644 --- a/release/sysinstall/install.cfg +++ b/release/sysinstall/install.cfg @@ -25,7 +25,7 @@ mediaSetFTP ################################ # Select which distributions we want. -dists=bin doc manpages info compat21 des src sbase slkm ssys +dists=bin doc manpages info compat21 des src sbase ssys distSetCustom ################################ diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 768939446acf..514ee38b1960 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.177 1998/12/22 12:31:25 jkh Exp $ + * $Id: menus.c,v 1.178 1998/12/25 21:57:06 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -821,8 +821,6 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB }, { "libexec", "/usr/src/libexec (system programs)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC }, - { "lkm", "/usr/src/lkm (Loadable Kernel Modules)", - dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM }, { "release", "/usr/src/release (release-generation tools)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE }, { "bin", "/usr/src/bin (system binaries)", diff --git a/release/sysinstall/sysinstall.8 b/release/sysinstall/sysinstall.8 index 4690ae58b3bb..2be7509309bb 100644 --- a/release/sysinstall/sysinstall.8 +++ b/release/sysinstall/sysinstall.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: sysinstall.8,v 1.12 1998/11/21 21:45:27 jkh Exp $ +.\" $Id: sysinstall.8,v 1.13 1998/12/02 03:27:37 jkh Exp $ .\" .Dd August 9, 1997 .Dt SYSINSTALL 8 @@ -394,8 +394,6 @@ Kerberos binaries. /usr/src/lib .It Li slibexec /usr/src/libexec -.It Li slkm -/usr/src/lkm .It Li srelease /usr/src/release .It Li sbin diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 768939446acf..514ee38b1960 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.177 1998/12/22 12:31:25 jkh Exp $ + * $Id: menus.c,v 1.178 1998/12/25 21:57:06 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -821,8 +821,6 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB }, { "libexec", "/usr/src/libexec (system programs)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC }, - { "lkm", "/usr/src/lkm (Loadable Kernel Modules)", - dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM }, { "release", "/usr/src/release (release-generation tools)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE }, { "bin", "/usr/src/bin (system binaries)", diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8 index 4690ae58b3bb..2be7509309bb 100644 --- a/usr.sbin/sade/sade.8 +++ b/usr.sbin/sade/sade.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: sysinstall.8,v 1.12 1998/11/21 21:45:27 jkh Exp $ +.\" $Id: sysinstall.8,v 1.13 1998/12/02 03:27:37 jkh Exp $ .\" .Dd August 9, 1997 .Dt SYSINSTALL 8 @@ -394,8 +394,6 @@ Kerberos binaries. /usr/src/lib .It Li slibexec /usr/src/libexec -.It Li slkm -/usr/src/lkm .It Li srelease /usr/src/release .It Li sbin diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index ec22ea50dc55..d84c6ef5331a 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.130 1998/11/15 09:06:19 jkh Exp $ + * $Id: dist.c,v 1.131 1998/11/27 00:30:10 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -101,7 +101,6 @@ static Distribution SrcDistTable[] = { { "sinclude", "/usr/src", &SrcDists, DIST_SRC_INCLUDE, NULL }, { "slib", "/usr/src", &SrcDists, DIST_SRC_LIB, NULL }, { "slibexec", "/usr/src", &SrcDists, DIST_SRC_LIBEXEC, NULL }, -{ "slkm", "/usr/src", &SrcDists, DIST_SRC_LKM, NULL }, { "srelease", "/usr/src", &SrcDists, DIST_SRC_RELEASE, NULL }, { "sbin", "/usr/src", &SrcDists, DIST_SRC_BIN, NULL }, { "ssbin", "/usr/src", &SrcDists, DIST_SRC_SBIN, NULL }, diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index 9418a5cdd013..19efb223faec 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -43,7 +43,7 @@ #define DIST_SRC_INCLUDE 0x00020 #define DIST_SRC_LIB 0x00040 #define DIST_SRC_LIBEXEC 0x00080 -#define DIST_SRC_LKM 0x00100 +/* 0x00100 */ #define DIST_SRC_RELEASE 0x00200 #define DIST_SRC_SBIN 0x00400 #define DIST_SRC_SHARE 0x00800 diff --git a/usr.sbin/sysinstall/install.cfg b/usr.sbin/sysinstall/install.cfg index 0949fd3a0fb0..cade7a27ed5f 100644 --- a/usr.sbin/sysinstall/install.cfg +++ b/usr.sbin/sysinstall/install.cfg @@ -25,7 +25,7 @@ mediaSetFTP ################################ # Select which distributions we want. -dists=bin doc manpages info compat21 des src sbase slkm ssys +dists=bin doc manpages info compat21 des src sbase ssys distSetCustom ################################ diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 768939446acf..514ee38b1960 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.177 1998/12/22 12:31:25 jkh Exp $ + * $Id: menus.c,v 1.178 1998/12/25 21:57:06 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -821,8 +821,6 @@ DMenu MenuSrcDistributions = { dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB }, { "libexec", "/usr/src/libexec (system programs)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC }, - { "lkm", "/usr/src/lkm (Loadable Kernel Modules)", - dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM }, { "release", "/usr/src/release (release-generation tools)", dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE }, { "bin", "/usr/src/bin (system binaries)", diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index 4690ae58b3bb..2be7509309bb 100644 --- a/usr.sbin/sysinstall/sysinstall.8 +++ b/usr.sbin/sysinstall/sysinstall.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: sysinstall.8,v 1.12 1998/11/21 21:45:27 jkh Exp $ +.\" $Id: sysinstall.8,v 1.13 1998/12/02 03:27:37 jkh Exp $ .\" .Dd August 9, 1997 .Dt SYSINSTALL 8 @@ -394,8 +394,6 @@ Kerberos binaries. /usr/src/lib .It Li slibexec /usr/src/libexec -.It Li slkm -/usr/src/lkm .It Li srelease /usr/src/release .It Li sbin