[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/548eb25425ec
branches:  netbsd-7
changeset: 798867:548eb25425ec
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jan 20 09:50:46 2015 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #437):
        distrib/utils/embedded/mkimage: revision 1.50
Use [dx]sets_p as flag for debug/X sets inclusion. xsets is the list of
sets.

diffstat:

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

diffs (45 lines):

diff -r f655dbda6d04 -r 548eb25425ec distrib/utils/embedded/mkimage
--- a/distrib/utils/embedded/mkimage    Tue Jan 20 09:45:20 2015 +0000
+++ b/distrib/utils/embedded/mkimage    Tue Jan 20 09:50:46 2015 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.48 2014/04/03 22:51:38 christos Exp $
+# $NetBSD: mkimage,v 1.48.4.1 2015/01/20 09:50:46 martin Exp $
 #
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -106,8 +106,8 @@
 release="/usr/obj/${MACHINE}/release"
 
 selected_sets="$sets"
-dsets=false
-xsets=false
+dsets_p=false
+xsets_p=false
 minwrites=false
 rootdev=ld
 
@@ -119,9 +119,9 @@
        K)      kernel="$OPTARG";;
        S)      ;;
        b)      bootonly=true;;
-       d)      dsets=true
+       d)      dsets_p=true
                selected_sets="$selected_sets debug"
-               if $xsets; then
+               if $xsets_p; then
                        selected_sets="$selected_sets xdebug"
                fi
                ;;
@@ -130,9 +130,9 @@
        m)      minwrites=true;;
        r)      rootdev="$OPTARG";;
        s)      size="$OPTARG";;
-       x)      xsets=true
+       x)      xsets_p=true
                selected_sets="$selected_sets $xsets"
-               if $dsets; then
+               if $dsets_p; then
                    selected_sets="$selected_sets xdebug"
                fi
                ;;