Module Name: src
Committed By: aymeric
Date: Fri Dec 24 10:11:40 UTC 2010
Modified Files:
src/distrib/macppc/floppies/ramdisk: Makefile
src/sys/arch/macppc/conf: GENERIC_MD INSTALL MAMBO POWERMAC_G5
Log Message:
Bump ramdisk size by 64K. This allows release builds to finish on macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/conf/GENERIC_MD \
src/sys/arch/macppc/conf/MAMBO
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/macppc/conf/INSTALL
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/macppc/conf/POWERMAC_G5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.38 src/distrib/macppc/floppies/ramdisk/Makefile:1.39
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.38 Thu Feb 11 09:06:49 2010
+++ src/distrib/macppc/floppies/ramdisk/Makefile Fri Dec 24 10:11:39 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2010/02/11 09:06:49 roy Exp $
+# $NetBSD: Makefile,v 1.39 2010/12/24 10:11:39 aymeric Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 2048k
+IMAGESIZE= 2112k
MAKEFS_FLAGS= -f 15
WARNS= 1
Index: src/sys/arch/macppc/conf/GENERIC_MD
diff -u src/sys/arch/macppc/conf/GENERIC_MD:1.10 src/sys/arch/macppc/conf/GENERIC_MD:1.11
--- src/sys/arch/macppc/conf/GENERIC_MD:1.10 Fri Feb 6 18:50:28 2009
+++ src/sys/arch/macppc/conf/GENERIC_MD Fri Dec 24 10:11:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_MD,v 1.10 2009/02/06 18:50:28 jym Exp $
+# $NetBSD: GENERIC_MD,v 1.11 2010/12/24 10:11:39 aymeric Exp $
#
# GENERIC_MD config file
#
@@ -8,5 +8,5 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
Index: src/sys/arch/macppc/conf/MAMBO
diff -u src/sys/arch/macppc/conf/MAMBO:1.10 src/sys/arch/macppc/conf/MAMBO:1.11
--- src/sys/arch/macppc/conf/MAMBO:1.10 Tue Nov 23 11:14:02 2010
+++ src/sys/arch/macppc/conf/MAMBO Fri Dec 24 10:11:39 2010
@@ -6,7 +6,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.10 $"
+#ident "GENERIC-$Revision: 1.11 $"
maxusers 32
@@ -203,7 +203,7 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
options MAMBO
Index: src/sys/arch/macppc/conf/INSTALL
diff -u src/sys/arch/macppc/conf/INSTALL:1.110 src/sys/arch/macppc/conf/INSTALL:1.111
--- src/sys/arch/macppc/conf/INSTALL:1.110 Tue Nov 23 11:14:02 2010
+++ src/sys/arch/macppc/conf/INSTALL Fri Dec 24 10:11:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.110 2010/11/23 11:14:02 hannken Exp $
+# $NetBSD: INSTALL,v 1.111 2010/12/24 10:11:39 aymeric Exp $
#
# config file for INSTALL FLOPPY
#
@@ -17,7 +17,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
options USERCONF # userconf(4) support
Index: src/sys/arch/macppc/conf/POWERMAC_G5
diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.11 src/sys/arch/macppc/conf/POWERMAC_G5:1.12
--- src/sys/arch/macppc/conf/POWERMAC_G5:1.11 Tue Nov 23 11:14:02 2010
+++ src/sys/arch/macppc/conf/POWERMAC_G5 Fri Dec 24 10:11:39 2010
@@ -193,5 +193,5 @@
# Enable the hooks used for initializing the ram-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on ram-disk
-options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
+options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
