Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Get macppc to build again by adjusting sizes.



details:   https://anonhg.NetBSD.org/src/rev/253cdcda40e5
branches:  trunk
changeset: 331289:253cdcda40e5
user:      gdt <gdt%NetBSD.org@localhost>
date:      Thu Aug 07 16:51:56 2014 +0000

description:
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.

diffstat:

 distrib/macppc/floppies/ramdisk/Makefile |  8 ++++++--
 sys/arch/macppc/conf/GENERIC_MD          |  4 ++--
 sys/arch/macppc/conf/INSTALL             |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 9fdaf5cd9608 -r 253cdcda40e5 distrib/macppc/floppies/ramdisk/Makefile
--- a/distrib/macppc/floppies/ramdisk/Makefile  Thu Aug 07 15:48:19 2014 +0000
+++ b/distrib/macppc/floppies/ramdisk/Makefile  Thu Aug 07 16:51:56 2014 +0000
@@ -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
diff -r 9fdaf5cd9608 -r 253cdcda40e5 sys/arch/macppc/conf/GENERIC_MD
--- a/sys/arch/macppc/conf/GENERIC_MD   Thu Aug 07 15:48:19 2014 +0000
+++ b/sys/arch/macppc/conf/GENERIC_MD   Thu Aug 07 16:51:56 2014 +0000
@@ -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 @@
 # 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
diff -r 9fdaf5cd9608 -r 253cdcda40e5 sys/arch/macppc/conf/INSTALL
--- a/sys/arch/macppc/conf/INSTALL      Thu Aug 07 15:48:19 2014 +0000
+++ b/sys/arch/macppc/conf/INSTALL      Thu Aug 07 16:51:56 2014 +0000
@@ -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        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



Home | Main Index | Thread Index | Old Index