[src/netbsd-7]: src/distrib/utils/embedded Pull up following revision(s) (req...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/381dc6276358
branches:  netbsd-7
changeset: 798924:381dc6276358
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 29 15:12:48 2015 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #470):
        distrib/utils/embedded/mkimage: revision 1.52
        distrib/utils/embedded/conf/x86.conf: revision 1.7
        distrib/utils/embedded/conf/evbarm.conf: revision 1.20
Fix previous so that the new generated rc.conf is picked up and that
any new new mount points (e.g. /proc and /kern) are generated.
While here increate the fs size so that postfix can actually build
/etc/mail/aliases.db

diffstat:

 distrib/utils/embedded/conf/evbarm.conf |  13 +++++++++++--
 distrib/utils/embedded/conf/x86.conf    |  13 +++++++++----
 distrib/utils/embedded/mkimage          |   4 ++--
 3 files changed, 22 insertions(+), 8 deletions(-)

diffs (101 lines):

diff -r 34e8fb7fe282 -r 381dc6276358 distrib/utils/embedded/conf/evbarm.conf
--- a/distrib/utils/embedded/conf/evbarm.conf   Wed Jan 28 22:06:14 2015 +0000
+++ b/distrib/utils/embedded/conf/evbarm.conf   Thu Jan 29 15:12:48 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.15.4.3 2015/01/28 18:37:45 martin Exp $
+# $NetBSD: evbarm.conf,v 1.15.4.4 2015/01/29 15:12:48 martin Exp $
 # evbarm shared config
 #
 image=$HOME/${board}.img
@@ -6,7 +6,7 @@
 MACHINE=evbarm
 
 swap=256
-extra=8                # spare space
+extra=48               # spare space
 boot=112
 init=8
 ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
@@ -110,6 +110,12 @@
        fi
        echo "./etc/fstab type=file uname=root gname=wheel mode=0644" \
            >> "$tmp/selected_sets"
+
+       # Missing mount points from fstab
+       echo "./proc type=dir uname=root gname=wheel mode=0755" \
+           >> "$tmp/selected_sets"
+       echo "./kern type=dir uname=root gname=wheel mode=0755" \
+           >> "$tmp/selected_sets"
 }
 
 customize_evbarm() {
@@ -126,6 +132,9 @@
 sshd=YES
 dhcpcd=YES
 EOF
+       echo "./etc/rc.conf type=file uname=root gname=wheel mode=0644" \
+           >> "$tmp/selected_sets"
+
        if [ ! -f ${release}/dev/MAKEDEV ]; then
                echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2
                exit 1
diff -r 34e8fb7fe282 -r 381dc6276358 distrib/utils/embedded/conf/x86.conf
--- a/distrib/utils/embedded/conf/x86.conf      Wed Jan 28 22:06:14 2015 +0000
+++ b/distrib/utils/embedded/conf/x86.conf      Thu Jan 29 15:12:48 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: x86.conf,v 1.4.6.1 2015/01/28 22:06:14 martin Exp $
+# $NetBSD: x86.conf,v 1.4.6.2 2015/01/29 15:12:48 martin Exp $
 # x86 shared config
 #
 
@@ -92,6 +92,11 @@
        fi
        echo "./etc/fstab type=file uname=root gname=wheel mode=0755" \
            >> "$tmp/selected_sets"
+
+       echo "./proc type=dir uname=root gname=wheel mode=0755" \
+           >> "$tmp/selected_sets"
+       echo "./kern type=dir uname=root gname=wheel mode=0755" \
+           >> "$tmp/selected_sets"
 }
 
 customize() {
@@ -110,6 +115,9 @@
 wscons=YES
 devpubd=YES
 EOF
+       echo "./etc/rc.conf type=file uname=root gname=wheel mode=0644" \
+           >> "$tmp/selected_sets"
+
        if [ ! -f ${release}/dev/MAKEDEV ]; then
                echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2
                exit 1
@@ -117,9 +125,6 @@
        echo "${bar} running MAKEDEV ${bar}"
        ${HOST_SH} ${release}/dev/MAKEDEV -s all | sed -e 's:^\./:\./dev/:' \
            >> "$tmp/selected_sets"
-
-       echo "${bar} creating directories ${bar}"
-       mkdir ${mnt}/proc ${mnt}/kern
 }
 
 populate() {
diff -r 34e8fb7fe282 -r 381dc6276358 distrib/utils/embedded/mkimage
--- a/distrib/utils/embedded/mkimage    Wed Jan 28 22:06:14 2015 +0000
+++ b/distrib/utils/embedded/mkimage    Thu Jan 29 15:12:48 2015 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.48.4.2 2015/01/28 11:27:03 martin Exp $
+# $NetBSD: mkimage,v 1.48.4.3 2015/01/29 15:12:48 martin Exp $
 #
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -176,7 +176,7 @@
 
 if [ -z "${bootonly}" ]; then
        echo ${bar} Populating ffs filesystem ${bar}
-       ${MAKEFS} -N ${release}/etc -t ffs -rx \
+       ${MAKEFS} -r -N ${release}/etc -t ffs -rx \
            -O ${ffsoffset} \
            -o d=4096 -b $((${extra}))m \
            -F "$tmp/selected_sets" ${image} "${release}" "${mnt}"