Module Name: src
Committed By: gdt
Date: Thu Aug 7 16:51:57 UTC 2014
Modified Files:
src/distrib/macppc/floppies/ramdisk: Makefile
src/sys/arch/macppc/conf: GENERIC_MD INSTALL
Log Message:
Get macppc to build again by adjusting sizes.
In addition to the ramdisk size, it is necessary to have matching MD
sizes. Increase the MD sizes, and leave a comment near the ramdisk
size to ease future changes.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/distrib/macppc/floppies/ramdisk/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/macppc/conf/GENERIC_MD
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/macppc/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/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.44 src/distrib/macppc/floppies/ramdisk/Makefile:1.45
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.44 Thu Aug 7 15:48:19 2014
+++ src/distrib/macppc/floppies/ramdisk/Makefile Thu Aug 7 16:51:57 2014
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.44 2014/08/07 15:48:19 gdt Exp $
+# $NetBSD: Makefile,v 1.45 2014/08/07 16:51:57 gdt Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 2244k
+# This must be kept in sync with config option MEMORY_DISK_ROOT_SIZE
+# in both
+# src/sys/arch/macppc/conf/INSTALL
+# src/sys/arch/macppc/conf/GENERIC_MD
+IMAGESIZE= 2248k
MAKEFS_FLAGS= -f 15
WARNS= 1
Index: src/sys/arch/macppc/conf/GENERIC_MD
diff -u src/sys/arch/macppc/conf/GENERIC_MD:1.14 src/sys/arch/macppc/conf/GENERIC_MD:1.15
--- src/sys/arch/macppc/conf/GENERIC_MD:1.14 Wed Aug 6 14:23:53 2014
+++ src/sys/arch/macppc/conf/GENERIC_MD Thu Aug 7 16:51:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_MD,v 1.14 2014/08/06 14:23:53 martin Exp $
+# $NetBSD: GENERIC_MD,v 1.15 2014/08/07 16:51:56 gdt Exp $
#
# GENERIC_MD config file
#
@@ -8,5 +8,5 @@ include "arch/macppc/conf/GENERIC"
# 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=4480 # 2240 KiB
+options MEMORY_DISK_ROOT_SIZE=4496 # 2248 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
Index: src/sys/arch/macppc/conf/INSTALL
diff -u src/sys/arch/macppc/conf/INSTALL:1.121 src/sys/arch/macppc/conf/INSTALL:1.122
--- src/sys/arch/macppc/conf/INSTALL:1.121 Wed Aug 6 14:23:53 2014
+++ src/sys/arch/macppc/conf/INSTALL Thu Aug 7 16:51:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.121 2014/08/06 14:23:53 martin Exp $
+# $NetBSD: INSTALL,v 1.122 2014/08/07 16:51:56 gdt Exp $
#
# config file for INSTALL FLOPPY
#
@@ -17,7 +17,7 @@ options RTC_OFFSET=0 # hardware clock i
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=4480 # 2240 KiB
+options MEMORY_DISK_ROOT_SIZE=4496 # 2248 KiB
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
options USERCONF # userconf(4) support
