Module Name: src
Committed By: martin
Date: Fri Mar 12 23:07:13 UTC 2010
Modified Files:
src/distrib/sparc64/bootfs: Makefile
src/distrib/sparc64/instfs: Makefile list
src/distrib/sparc64/xminiroot: Makefile
src/sys/arch/sparc64/conf: INSTALL
Log Message:
Provide full terminfo.db on install media
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/sparc64/bootfs/Makefile
cvs rdiff -u -r1.13 -r1.14 src/distrib/sparc64/instfs/Makefile
cvs rdiff -u -r1.18 -r1.19 src/distrib/sparc64/instfs/list
cvs rdiff -u -r1.28 -r1.29 src/distrib/sparc64/xminiroot/Makefile
cvs rdiff -u -r1.25 -r1.26 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/bootfs/Makefile
diff -u src/distrib/sparc64/bootfs/Makefile:1.7 src/distrib/sparc64/bootfs/Makefile:1.8
--- src/distrib/sparc64/bootfs/Makefile:1.7 Tue Mar 2 08:05:48 2010
+++ src/distrib/sparc64/bootfs/Makefile Fri Mar 12 23:07:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/03/02 08:05:48 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/12 23:07:13 martin Exp $
#
# boot.fs is the image for cdrom booting.
#
@@ -15,7 +15,7 @@
.include <bsd.kernobj.mk>
IMAGE= boot.fs
-IMAGESIZE= 6m
+IMAGESIZE= 9m
IMAGEENDIAN= be
LISTS= ${.CURDIR}/list
Index: src/distrib/sparc64/instfs/Makefile
diff -u src/distrib/sparc64/instfs/Makefile:1.13 src/distrib/sparc64/instfs/Makefile:1.14
--- src/distrib/sparc64/instfs/Makefile:1.13 Tue Apr 7 11:49:18 2009
+++ src/distrib/sparc64/instfs/Makefile Fri Mar 12 23:07:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/04/07 11:49:18 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/03/12 23:07:13 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= 5m
+IMAGESIZE= 8m
IMAGETAR= instfs.tgz
IMAGETAR_RELEASEDIR= installation/misc
Index: src/distrib/sparc64/instfs/list
diff -u src/distrib/sparc64/instfs/list:1.18 src/distrib/sparc64/instfs/list:1.19
--- src/distrib/sparc64/instfs/list:1.18 Wed Feb 17 16:15:15 2010
+++ src/distrib/sparc64/instfs/list Fri Mar 12 23:07:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.18 2010/02/17 16:15:15 martin Exp $
+# $NetBSD: list,v 1.19 2010/03/12 23:07:13 martin Exp $
SRCDIRS bin sbin libexec usr.bin/less usr.bin usr.sbin gnu/usr.bin
@@ -84,6 +84,7 @@
COPY ${NETBSDSRCDIR}/etc/netconfig etc/netconfig
COPY ${DISTRIBDIR}/common/protocols etc/protocols
COPY ${DISTRIBDIR}/common/services etc/services
+COPY ${DESTDIR}/usr/share/misc/terminfo.db usr/share/misc/terminfo.db
# we need the boot block in /usr/mdec + the arch specific extras
COPY ${DESTDIR}/usr/mdec/binstall usr/mdec/binstall 555
Index: src/distrib/sparc64/xminiroot/Makefile
diff -u src/distrib/sparc64/xminiroot/Makefile:1.28 src/distrib/sparc64/xminiroot/Makefile:1.29
--- src/distrib/sparc64/xminiroot/Makefile:1.28 Tue Jan 5 18:36:16 2010
+++ src/distrib/sparc64/xminiroot/Makefile Fri Mar 12 23:07:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2010/01/05 18:36:16 he Exp $
+# $NetBSD: Makefile,v 1.29 2010/03/12 23:07:13 martin Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -7,7 +7,7 @@
.include "${.CURDIR}/../instfs/Makefile.instfs"
IMAGE= miniroot.fs
-IMAGESIZE= 9m
+IMAGESIZE= 12m
IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} \
${DESTDIR}/usr/mdec/bootblk
IMAGE_RELEASEDIR= installation/miniroot
Index: src/sys/arch/sparc64/conf/INSTALL
diff -u src/sys/arch/sparc64/conf/INSTALL:1.25 src/sys/arch/sparc64/conf/INSTALL:1.26
--- src/sys/arch/sparc64/conf/INSTALL:1.25 Fri Feb 6 18:50:28 2009
+++ src/sys/arch/sparc64/conf/INSTALL Fri Mar 12 23:07:13 2010
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.25 2009/02/06 18:50:28 jym Exp $
+# $NetBSD: INSTALL,v 1.26 2010/03/12 23:07:13 martin Exp $
#
# NOTE: this file only needs *additional* things for the install
# kernel, that are not already included in GENERIC32!
@@ -6,7 +6,7 @@
include "arch/sparc64/conf/GENERIC"
-#ident "INSTALL-$Revision: 1.25 $"
+#ident "INSTALL-$Revision: 1.26 $"
makeoptions COPTS="-Os"
@@ -21,6 +21,6 @@
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=10240 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=16384 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
