[src/trunk]: src/distrib/utils/embedded fix usage again -- -D specifies destd...

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

details:   https://anonhg.NetBSD.org/src/rev/5f7c1170d1eb
branches:  trunk
changeset: 784775:5f7c1170d1eb
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Feb 09 11:20:56 2013 +0000

description:
fix usage again -- -D specifies destdir not releasedir
include conf/${h}.conf not conf/rpi.conf
fix ./mkimage: line 110: "7" - 1 : syntax error: operand expected (error token is ""7" - 1 ")

diffstat:

 distrib/utils/embedded/mkimage |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 70f165a4bb00 -r 5f7c1170d1eb distrib/utils/embedded/mkimage
--- a/distrib/utils/embedded/mkimage    Sat Feb 09 11:19:55 2013 +0000
+++ b/distrib/utils/embedded/mkimage    Sat Feb 09 11:20:56 2013 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.19 2013/02/09 11:15:14 jmcneill Exp $
+# $NetBSD: mkimage,v 1.20 2013/02/09 11:20:56 jmcneill Exp $
 #
 # Copyright (c) 2013 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -60,7 +60,7 @@
 
 usage() {
        cat << EOF 1>&2
-Usage: $PROG -h <host-arch> [-K <kerneldir>] [-S <srcdir>] [-D <releasedir>] [-c <custom-files-dir>] [-s <Mb size>] [<image>]
+Usage: $PROG -h <host-arch> [-K <kerneldir>] [-S <srcdir>] [-D <destdir>] [-c <custom-files-dir>] [-s <Mb size>] [<image>]
 EOF
        exit 1
 }
@@ -107,14 +107,14 @@
 
 trap cleanup 0 1 2 3 15
 
-shift $(( "$OPTIND" - 1 ))
+shift $(( $OPTIND - 1 ))
 if [ -n "$1" ]; then
        # take the next argument as being the image name
        image="$1"
        shift
 fi
 
-. "$DIR/conf/rpi.conf"
+. "${DIR}/conf/${h}.conf"
 
 echo ${bar} configuring sets ${bar}
 (echo '/set type=dir uname=root gname=wheel mode=0755'