Module Name: src
Committed By: msaitoh
Date: Sat May 9 08:37:32 UTC 2015
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk [netbsd-7]: Makefile
src/sys/arch/evbarm/conf [netbsd-7]: RPI_INSTALL
Log Message:
Pull up following revision(s) (requested by snj in ticket #1957):
distrib/evbarm/instkernel/sshramdisk/Makefile patch
sys/arch/evbarm/conf/RPI_INSTALL patch
Increase ramdisk size to fix build break.
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 \
src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/arch/evbarm/conf/RPI_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/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.3.6.1 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.3.6.2
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.3.6.1 Thu May 7 20:42:37 2015
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Sat May 9 08:37:32 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3.6.1 2015/05/07 20:42:37 riz Exp $
+# $NetBSD: Makefile,v 1.3.6.2 2015/05/09 08:37:32 msaitoh Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 4321k
+IMAGESIZE= 5000k
MAKEFS_FLAGS= -f 15
WARNS= 1
Index: src/sys/arch/evbarm/conf/RPI_INSTALL
diff -u src/sys/arch/evbarm/conf/RPI_INSTALL:1.3 src/sys/arch/evbarm/conf/RPI_INSTALL:1.3.4.1
--- src/sys/arch/evbarm/conf/RPI_INSTALL:1.3 Thu May 1 18:43:45 2014
+++ src/sys/arch/evbarm/conf/RPI_INSTALL Sat May 9 08:37:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: RPI_INSTALL,v 1.3 2014/05/01 18:43:45 martin Exp $
+# $NetBSD: RPI_INSTALL,v 1.3.4.1 2015/05/09 08:37:32 msaitoh Exp $
#
# RPI_INSTALL -- RPI kernel with installation-sized
# ramdisk
@@ -7,5 +7,8 @@
include "arch/evbarm/conf/RPI"
include "arch/evbarm/conf/INSTALL"
+no options MEMORY_DISK_ROOT_SIZE
+options MEMORY_DISK_ROOT_SIZE=29696
+
makeoptions RAMDISKNAME=sshramdisk
no makeoptions DEBUG
