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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/build.sh,v
rcsdiff: /ftp/cvs/cvsroot/src/build.sh,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.153.2.3
retrieving revision 1.153.2.4
diff -u -p -r1.153.2.3 -r1.153.2.4
--- src/build.sh	2007/07/19 14:38:13	1.153.2.3
+++ src/build.sh	2007/09/29 11:10:56	1.153.2.4
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.153.2.3 2007/07/19 14:38:13 liamjfoy Exp $
+#	$NetBSD: build.sh,v 1.153.2.4 2007/09/29 11:10:56 xtraeme Exp $
 #
 # Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -219,6 +219,7 @@ initdefaults()
 	do_sourcesets=false
 	do_syspkgs=false
 	do_iso_image=false
+	do_iso_image_source=false
 	do_params=false
 
 	# Create scratch directory
@@ -455,9 +456,9 @@ usage()
 	fi
 	cat <<_usage_
 
-Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-D dest] [-j njob]
-		[-M obj] [-m mach] [-N noisy] [-O obj] [-R release] [-T tools]
-		[-V var=[value]] [-w wrapper] [-X x11src] [-Z var]
+Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-C cddir] [-D dest]
+		[-j njob] [-M obj] [-m mach] [-N noisy] [-O obj] [-R release]
+		[-T tools] [-V var=[value]] [-w wrapper] [-X x11src] [-Z var]
 		operation [...]
 
  Build operations (all imply "obj" and "tools"):
@@ -479,12 +480,15 @@ Usage: ${progname} [-EnorUux] [-a arch] 
 			DESTDIR should be populated beforehand.
     sourcesets          Create source sets in RELEASEDIR/source/sets.
     syspkgs             Create syspkgs in RELEASEDIR/MACHINE/binary/syspkgs.
-    iso-image           Create CD-ROM image in RELEASEDIR/MACHINE/installation.
+    iso-image           Create CD-ROM image in RELEASEDIR/iso.
+    iso-image-source    Create CD-ROM image with source in RELEASEDIR/iso.
+    iso-dir=cddir       Add the contents of \`cddir' to a CD-ROM image.
     params              Display various make(1) parameters.
 
  Options:
     -a arch     Set MACHINE_ARCH to arch.  [Default: deduced from MACHINE]
     -B buildId  Set BUILDID to buildId.
+    -C cddir    Set CDEXTRA to cddir.
     -D dest     Set DESTDIR to dest.  [Default: destdir.MACHINE]
     -E          Set "expert" mode; disables various safety checks.
                 Should not be used without expert knowledge of the build system.
@@ -523,7 +527,7 @@ _usage_
 
 parseoptions()
 {
-	opts='a:B:bD:dEhi:j:k:M:m:N:nO:oR:rT:tUuV:w:xX:Z:'
+	opts='a:B:bC:D:dEhi:j:k:M:m:N:nO:oR:rT:tUuV:w:xX:Z:'
 	opt_a=no
 
 	if type getopts >/dev/null 2>&1; then
@@ -567,6 +571,11 @@ parseoptions()
 			usage "'-b' has been replaced by 'makewrapper'"
 			;;
 
+		-C)
+			eval ${optargcmd}; resolvepath
+			iso_dir=${OPTARG}
+			;;
+
 		-D)
 			eval ${optargcmd}; resolvepath
 			setmakeenv DESTDIR "${OPTARG}"
@@ -726,6 +735,10 @@ parseoptions()
 			op=iso_image	# used as part of a variable name
 			;;
 
+		iso-image-source)
+			op=iso_image_source   # used as part of a variable name
+			;;
+
 		kernel=*|releasekernel=*)
 			arg=${op#*=}
 			op=${op%%=*}
@@ -965,7 +978,7 @@ createmakewrapper()
 	eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.153.2.3 2007/07/19 14:38:13 liamjfoy Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.153.2.4 2007/09/29 11:10:56 xtraeme Exp $
 # with these arguments: ${_args}
 #
 EOF
@@ -1143,12 +1156,19 @@ main()
 			statusmsg "Successful make ${op}"
 			;;
 
-		obj|build|distribution|iso-image|release|sourcesets|syspkgs|params)
+		obj|build|distribution|release|sourcesets|syspkgs|params)
 			${runcmd} "${makewrapper}" ${parallel} ${op} ||
 			    bomb "Failed to make ${op}"
 			statusmsg "Successful make ${op}"
 			;;
 
+		iso-image|iso-image-source)
+			${runcmd} "${makewrapper}" ${parallel} \
+			    CDEXTRA=$iso_dir ${op} ||
+			    bomb "Failed to make ${op}"
+			statusmsg "Successful make ${op}"
+			;;
+
 		kernel=*)
 			arg=${op#*=}
 			buildkernel "${arg}"