Module Name: src
Committed By: martin
Date: Thu Jan 9 19:09:47 UTC 2025
Modified Files:
src/distrib/sparc64/instfs: Makefile
src/distrib/sparc64/xminiroot: Makefile
src/sys/arch/sparc64/conf: INSTALL
Log Message:
Bump ramdisk size to deal with bigger image for new pppd
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sparc64/instfs/Makefile
cvs rdiff -u -r1.34 -r1.35 src/distrib/sparc64/xminiroot/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc64/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/sparc64/instfs/Makefile
diff -u src/distrib/sparc64/instfs/Makefile:1.16 src/distrib/sparc64/instfs/Makefile:1.17
--- src/distrib/sparc64/instfs/Makefile:1.16 Tue Nov 1 09:28:14 2011
+++ src/distrib/sparc64/instfs/Makefile Thu Jan 9 19:09:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/11/01 09:28:14 martin Exp $
+# $NetBSD: Makefile,v 1.17 2025/01/09 19:09:47 martin Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -7,7 +7,7 @@
.include "${.CURDIR}/../instfs/Makefile.instfs"
IMAGE= install.fs
-IMAGESIZE= 9m
+IMAGESIZE= 11m
IMAGETAR= instfs.tgz
IMAGETAR_RELEASEDIR= installation/misc
Index: src/distrib/sparc64/xminiroot/Makefile
diff -u src/distrib/sparc64/xminiroot/Makefile:1.34 src/distrib/sparc64/xminiroot/Makefile:1.35
--- src/distrib/sparc64/xminiroot/Makefile:1.34 Mon Jul 17 14:36:13 2017
+++ src/distrib/sparc64/xminiroot/Makefile Thu Jan 9 19:09:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/07/17 14:36:13 hannken Exp $
+# $NetBSD: Makefile,v 1.35 2025/01/09 19:09:47 martin Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -7,7 +7,8 @@
.include "${.CURDIR}/../instfs/Makefile.instfs"
IMAGE= miniroot.fs
-NUMCYLS= 14 # size of image in MB, tune this if we need more space
+NUMCYLS= 17 # size of image in MB, tune this if we need more space
+ # (slightly bigger than ../instfs IMGSIZE)
SECSPERCYL= 2048
CYLSIZE= $$(( ${SECSPERCYL} * 512 ))
IMAGESIZE= $$(( ${NUMCYLS} * ${CYLSIZE} ))
Index: src/sys/arch/sparc64/conf/INSTALL
diff -u src/sys/arch/sparc64/conf/INSTALL:1.30 src/sys/arch/sparc64/conf/INSTALL:1.31
--- src/sys/arch/sparc64/conf/INSTALL:1.30 Wed May 25 20:00:50 2016
+++ src/sys/arch/sparc64/conf/INSTALL Thu Jan 9 19:09:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.30 2016/05/25 20:00:50 nakayama Exp $
+# $NetBSD: INSTALL,v 1.31 2025/01/09 19:09:47 martin Exp $
#
# NOTE: this file only needs *additional* things for the install
# kernel, that are not already included in GENERIC!
@@ -6,7 +6,7 @@
include "arch/sparc64/conf/GENERIC"
-#ident "INSTALL-$Revision: 1.30 $"
+#ident "INSTALL-$Revision: 1.31 $"
makeoptions COPTS="-Os -Wno-uninitialized"
@@ -20,7 +20,9 @@ options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
## The miniroot size must be kept in sync manually with the size of
-## the `miniroot' image (which is built in distrib/sparc64/miniroot).
-options MEMORY_DISK_ROOT_SIZE=18432 # size of memory disk, in blocks
+## the `miniroot' image, which is built in distrib/sparc64/miniroot.
+## This value comes from distrib/sparc64/xminiroot/Makefile
+## and is calculated like: expr 14 \* 1024 \* 2
+## since NUMCYLS=14
+options MEMORY_DISK_ROOT_SIZE=28672 # size of memory disk, in 512 byte blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
-
