Don't include options MULTICAST or MROUTING in generic kernels. MULTICAST

has no effect now, and MROUTING should never be defined by default.
(Eventually the code should be dynamically loadable.)

Also, allow for Pentium CPUs in GENERICBT kernels.

Add an `install' rule to Makefile.i386, which looks like this:
	mv /kernel /kernel.old
	install -c -m 555 -o root -g root -fschg kernel /
I'd like comments on whether or not you think it's a good idea to have
the kernel be immutable by default; I'm happy either way.
CVS:
This commit is contained in:
wollman 1994-09-09 22:03:51 +00:00
parent 50c647bbd7
commit af196a50e0
5 changed files with 18 additions and 9 deletions

View File

@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz # Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91 # from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.34 1994/09/05 19:09:15 jkh Exp $ # $Id: Makefile.i386,v 1.35 1994/09/05 19:10:01 jkh Exp $
# #
# Makefile for FreeBSD # Makefile for FreeBSD
# #
@ -172,6 +172,10 @@ links:
tags: tags:
@echo "see $S/kern/Makefile for tags" @echo "see $S/kern/Makefile for tags"
install:
mv /kernel /kernel.old
install -c -m 555 -o root -g wheel -fschg kernel /
ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \ ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
${CC} -c ${CFLAGS} ioconf.c ${CC} -c ${CFLAGS} ioconf.c

View File

@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz # Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91 # from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.34 1994/09/05 19:09:15 jkh Exp $ # $Id: Makefile.i386,v 1.35 1994/09/05 19:10:01 jkh Exp $
# #
# Makefile for FreeBSD # Makefile for FreeBSD
# #
@ -172,6 +172,10 @@ links:
tags: tags:
@echo "see $S/kern/Makefile for tags" @echo "see $S/kern/Makefile for tags"
install:
mv /kernel /kernel.old
install -c -m 555 -o root -g wheel -fschg kernel /
ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \ ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
${CC} -c ${CFLAGS} ioconf.c ${CC} -c ${CFLAGS} ioconf.c

View File

@ -1,7 +1,7 @@
# #
# GENERICAH -- Generic machine with WD/AHx/NCR family disks # GENERICAH -- Generic machine with WD/AHx/NCR family disks
# #
# $Id: GENERICAH,v 1.38 1994/08/31 06:17:19 davidg Exp $ # $Id: GENERICAH,v 1.39 1994/09/01 02:19:28 se Exp $
# #
machine "i386" machine "i386"
@ -14,8 +14,6 @@ maxusers 10
options MATH_EMULATE #Support for x87 emulation options MATH_EMULATE #Support for x87 emulation
options INET #InterNETworking options INET #InterNETworking
#options GATEWAY #Host is a Gateway (forwards packets) #options GATEWAY #Host is a Gateway (forwards packets)
options MULTICAST #IP Multicasting support
options MROUTING #IP Multicast Routing
options FFS #Berkeley Fast File System options FFS #Berkeley Fast File System
options LFS #Log File System options LFS #Log File System
options MFS #Memory File System options MFS #Memory File System

View File

@ -1,20 +1,19 @@
# #
# GENERICBT -- Generic machine with WD/BTx family disks # GENERICBT -- Generic machine with WD/BTx family disks
# #
# $Id: GENERICBT,v 1.36 1994/08/09 08:17:09 davidg Exp $ # $Id: GENERICBT,v 1.37 1994/08/31 06:17:20 davidg Exp $
# #
machine "i386" machine "i386"
cpu "I386_CPU" cpu "I386_CPU"
cpu "I486_CPU" cpu "I486_CPU"
cpu "I586_CPU"
ident GENERICBT ident GENERICBT
maxusers 10 maxusers 10
options MATH_EMULATE #Support for x87 emulation options MATH_EMULATE #Support for x87 emulation
options INET #InterNETworking options INET #InterNETworking
#options GATEWAY #Host is a Gateway (forwards packets) #options GATEWAY #Host is a Gateway (forwards packets)
options MULTICAST #IP Multicasting support
options MROUTING #IP Multicast Routing
options FFS #Berkeley Fast File System options FFS #Berkeley Fast File System
options LFS #Log File System options LFS #Log File System
options MFS #Memory File System options MFS #Memory File System

View File

@ -1,6 +1,6 @@
# Copyright 1990 W. Jolitz # Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91 # from: @(#)Makefile.i386 7.1 5/10/91
# $Id: Makefile.i386,v 1.34 1994/09/05 19:09:15 jkh Exp $ # $Id: Makefile.i386,v 1.35 1994/09/05 19:10:01 jkh Exp $
# #
# Makefile for FreeBSD # Makefile for FreeBSD
# #
@ -172,6 +172,10 @@ links:
tags: tags:
@echo "see $S/kern/Makefile for tags" @echo "see $S/kern/Makefile for tags"
install:
mv /kernel /kernel.old
install -c -m 555 -o root -g wheel -fschg kernel /
ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \ ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
${CC} -c ${CFLAGS} ioconf.c ${CC} -c ${CFLAGS} ioconf.c