Module Name: src
Committed By: bouyer
Date: Sun Jan 16 13:08:22 UTC 2011
Modified Files:
src/distrib/x68k/floppies/ramdisk [netbsd-5-1]: Makefile
src/sys/arch/x68k/conf [netbsd-5-1]: INSTALL
Log Message:
Pull up following revision(s) (requested by isaki in ticket #1531):
sys/arch/x68k/conf/INSTALL: revision 1.85
distrib/x68k/floppies/ramdisk/Makefile: revision 1.30
Increase the image size from 1300KB to 1400KB.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.8.1 src/distrib/x68k/floppies/ramdisk/Makefile
cvs rdiff -u -r1.80 -r1.80.10.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.29 src/distrib/x68k/floppies/ramdisk/Makefile:1.29.8.1
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.29 Sun May 11 09:35:53 2008
+++ src/distrib/x68k/floppies/ramdisk/Makefile Sun Jan 16 13:08:21 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2008/05/11 09:35:53 isaki Exp $
+# $NetBSD: Makefile,v 1.29.8.1 2011/01/16 13:08:21 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= inst.fs
-IMAGESIZE= 1300k
+IMAGESIZE= 1400k
# `floppy-root' cannot be used now, due to size issue.
#IMAGE_RELEASEDIR= installation/floppy
Index: src/sys/arch/x68k/conf/INSTALL
diff -u src/sys/arch/x68k/conf/INSTALL:1.80 src/sys/arch/x68k/conf/INSTALL:1.80.10.1
--- src/sys/arch/x68k/conf/INSTALL:1.80 Thu Jul 31 07:41:08 2008
+++ src/sys/arch/x68k/conf/INSTALL Sun Jan 16 13:08:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.80 2008/07/31 07:41:08 simonb Exp $
+# $NetBSD: INSTALL,v 1.80.10.1 2011/01/16 13:08:21 bouyer Exp $
#
# INSTALL -- installation kernel.
@@ -8,7 +8,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.80 $"
+#ident "INSTALL-$Revision: 1.80.10.1 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@@ -18,7 +18,7 @@
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=2600
+options MEMORY_DISK_ROOT_SIZE=2800
## System kernel configuration. See options(4) for more detail.
