Module Name: src
Committed By: jdc
Date: Sat Nov 24 19:22:17 UTC 2012
Modified Files:
src/distrib/x68k/floppies/ramdisk [netbsd-6]: Makefile
src/sys/arch/x68k/conf [netbsd-6]: INSTALL
Log Message:
Pull up revisions:
src/distrib/x68k/floppies/ramdisk/Makefile revision 1.41
src/sys/arch/x68k/conf/INSTALL revision 1.96
(requested by tsutsui in ticket #705).
- add dhcpcd support to x68k install ramdisk
- enable bpf(4) in INSTALL kernel for dhcpcd
- bump ramdisk size from 1400k to 1440k
No objection on port-x68k.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.8.1 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.94 -r1.94.2.1 src/sys/arch/x68k/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/x68k/floppies/ramdisk/Makefile
diff -u src/distrib/x68k/floppies/ramdisk/Makefile:1.40 src/distrib/x68k/floppies/ramdisk/Makefile:1.40.8.1
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.40 Thu Feb 11 09:06:51 2010
+++ src/distrib/x68k/floppies/ramdisk/Makefile Sat Nov 24 19:22:17 2012
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2010/02/11 09:06:51 roy Exp $
+# $NetBSD: Makefile,v 1.40.8.1 2012/11/24 19:22:17 jdc Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= inst.fs
-IMAGESIZE= 1400k
+IMAGESIZE= 1440k
# `floppy-root' cannot be used now, due to size issue.
#IMAGE_RELEASEDIR= installation/floppy
@@ -35,6 +35,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
.include "${HACKSRC}/Makefile.inc"
${CRUNCHBIN}: libhack.o
+.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.crunch"
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.94 src/sys/arch/x68k/conf/INSTALL:1.94.2.1
--- src/sys/arch/x68k/conf/INSTALL:1.94 Sun Dec 18 05:49:33 2011
+++ src/sys/arch/x68k/conf/INSTALL Sat Nov 24 19:22:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.94 2011/12/18 05:49:33 dholland Exp $
+# $NetBSD: INSTALL,v 1.94.2.1 2012/11/24 19:22:17 jdc Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.94 $"
+#ident "INSTALL-$Revision: 1.94.2.1 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -18,7 +18,7 @@ maxusers 4
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on memory-disk
options MEMORY_DISK_SERVER=0 # No user space hooks
-options MEMORY_DISK_ROOT_SIZE=2800
+options MEMORY_DISK_ROOT_SIZE=2880
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
## System kernel configuration. See options(4) for more detail.
@@ -277,5 +277,6 @@ ne* at neptune? addr 0x300 # NE2000 or
pseudo-device md # boot floppy image
pseudo-device loop
+pseudo-device bpfilter
pseudo-device sl
pseudo-device pty 2 # pseudo-terminals (Sysinst needs two)
