Module Name:    src
Committed By:   martin
Date:           Tue Jan 20 09:50:46 UTC 2015

Modified Files:
        src/distrib/utils/embedded [netbsd-7]: mkimage

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.4.1 src/distrib/utils/embedded/mkimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.48 src/distrib/utils/embedded/mkimage:1.48.4.1
--- src/distrib/utils/embedded/mkimage:1.48	Thu Apr  3 22:51:38 2014
+++ src/distrib/utils/embedded/mkimage	Tue Jan 20 09:50:46 2015
@@ -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 @@ fi
 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 @@ do
 	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 @@ do
 	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
 		;;

Reply via email to