[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/ac0802f96a2f
branches:  netbsd-7
changeset: 798914:ac0802f96a2f
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jan 28 11:27:03 2015 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #465):
        distrib/utils/embedded/conf/rpi_inst.conf: revision 1.6
        distrib/utils/embedded/conf/usermode.conf: revision 1.4
        distrib/utils/embedded/mkimage: revision 1.51
        distrib/utils/embedded/conf/x86.conf: revision 1.6
        distrib/utils/embedded/conf/evbarm.conf: revision 1.18
PR/49596: mkimage: incorrect permissions on evbarm images
Use NetBSD.dist in our mtree specification to populate the top level
directories, etc.
For each generated file hand craft an mtree entry.
Remove specialdirs as NetBSD.dist creates /proc and /kern.

diffstat:

 distrib/utils/embedded/conf/evbarm.conf   |  10 ++++++----
 distrib/utils/embedded/conf/rpi_inst.conf |   4 +---
 distrib/utils/embedded/conf/usermode.conf |   3 +--
 distrib/utils/embedded/mkimage            |   8 ++------
 4 files changed, 10 insertions(+), 15 deletions(-)

diffs (98 lines):

diff -r 0fb650ac9c8f -r ac0802f96a2f distrib/utils/embedded/conf/evbarm.conf
--- a/distrib/utils/embedded/conf/evbarm.conf   Wed Jan 28 11:24:31 2015 +0000
+++ b/distrib/utils/embedded/conf/evbarm.conf   Wed Jan 28 11:27:03 2015 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: evbarm.conf,v 1.15.4.1 2014/11/27 11:23:04 martin Exp $
+# $NetBSD: evbarm.conf,v 1.15.4.2 2015/01/28 11:27:03 martin Exp $
 # evbarm shared config
 #
 image=$HOME/${board}.img
 
-specialdirs="/kern /proc"
 MACHINE=evbarm
 
 swap=256
@@ -107,6 +106,8 @@
        else
                make_fstab_evbarm_normal
        fi
+       echo "./etc/fstab type=file uname=root gname=wheel mode=0644" \
+           >> "$tmp/selected_sets"
 }
 
 customize_evbarm() {
@@ -131,6 +132,7 @@
        ${HOST_SH} ${release}/dev/MAKEDEV -s all | sed -e 's:^\./:\./dev/:' \
            >> "$tmp/selected_sets"
 
-       echo "${bar} creating directories ${bar}"
-       mkdir ${mnt}/proc ${mnt}/kern
+       echo "${bar} fixing up permissions"
+       echo "./boot type=dir uname=root gname=wheel mode=0755" \
+           >> "$tmp/selected_sets"
 }
diff -r 0fb650ac9c8f -r ac0802f96a2f distrib/utils/embedded/conf/rpi_inst.conf
--- a/distrib/utils/embedded/conf/rpi_inst.conf Wed Jan 28 11:24:31 2015 +0000
+++ b/distrib/utils/embedded/conf/rpi_inst.conf Wed Jan 28 11:27:03 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.5 2014/04/03 01:36:20 ozaki-r Exp $
+# $NetBSD: rpi_inst.conf,v 1.5.6.1 2015/01/28 11:27:03 martin Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -9,8 +9,6 @@
 
 image=$HOME/${board}.img
 
-specialdirs="/kern /proc"
-
 swap=8
 extra=8                # spare space
 boot=112
diff -r 0fb650ac9c8f -r ac0802f96a2f distrib/utils/embedded/conf/usermode.conf
--- a/distrib/utils/embedded/conf/usermode.conf Wed Jan 28 11:24:31 2015 +0000
+++ b/distrib/utils/embedded/conf/usermode.conf Wed Jan 28 11:27:03 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: usermode.conf,v 1.3 2013/02/03 09:16:25 christos Exp $
+# $NetBSD: usermode.conf,v 1.3.12.1 2015/01/28 11:27:03 martin Exp $
 # NetBSD/usermode customization script used by mkimage
 
 # XXX: BROKEN, needs to be converted to makefs
@@ -8,7 +8,6 @@
 sets="base etc modules"
 setsdir=/usr/build/release/$(uname -m)/binary/sets
 size=0 # in MB
-specialdirs="/kern /proc"
 usermodedirs="/var.cow /etc.cow /root.cow /pkgs"
 
 make_filesystems() {
diff -r 0fb650ac9c8f -r ac0802f96a2f distrib/utils/embedded/mkimage
--- a/distrib/utils/embedded/mkimage    Wed Jan 28 11:24:31 2015 +0000
+++ b/distrib/utils/embedded/mkimage    Wed Jan 28 11:27:03 2015 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.48.4.1 2015/01/20 09:50:46 martin Exp $
+# $NetBSD: mkimage,v 1.48.4.2 2015/01/28 11:27:03 martin Exp $
 #
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -154,7 +154,7 @@
 
 if [ -z "${bootonly}" ]; then
        echo ${bar} configuring sets ${bar}
-       (echo '/set type=dir uname=root gname=wheel mode=0755'
+       (cat "${release}/etc/mtree/NetBSD.dist"
        for i in $selected_sets; do
                s="${release}/etc/mtree/set.$i"
                if [ -f "$s" ]; then
@@ -167,10 +167,6 @@
 customize
 populate
 
-if [ -z "${bootonly}" ]; then
-       (cd ${mnt}; ${MTREE} -N ${release}/etc -c -k all | 
-           ${MTREE} -N ${release}/etc -C -k all) >> "$tmp/selected_sets"
-fi
 if [ -n "${msdosid}" ]; then
        echo ${bar} Populating msdos filesystem ${bar}
        ${MAKEFS} -N ${release}/etc -t msdos \