From a186842ea201dd893651ed281a8e180210053fc6 Mon Sep 17 00:00:00 2001
From: jnemeth <jnemeth@NetBSD.org>
Date: Thu, 30 Aug 2007 05:30:02 +0000
Subject: [PATCH] Add an iso-image-source option which does the same thing as
 iso-image but includes source sets as well.  The infrastructure for this was
 already there, although it needed a bug fix.  Will look at adding arbitrary
 directories next.

---
 Makefile | 14 ++++++++++++--
 build.sh | 14 ++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 83ea530b15ef..65967ec44768 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.247 2007/03/06 21:56:47 bouyer Exp $
+#	$NetBSD: Makefile,v 1.248 2007/08/30 05:30:02 jnemeth Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -62,9 +62,13 @@
 #   syspkgs:
 #	Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}
 #   iso-image:
-#	Create CD-ROM image in RELEASEDIR/MACHINE/installation.
+#	Create CD-ROM image in RELEASEDIR/iso.
 #	RELEASEDIR must already have been populated by `make release'
 #	or equivalent.
+#   iso-image-source:
+#	Create CD-ROM image with source in RELEASEDIR/iso.
+#	RELEASEDIR must already have been populated by
+#	`make release sourcesets' or equivalent.
 #
 # Targets invoked by `make build,' in order:
 #   cleandir:        cleans the tree.
@@ -319,6 +323,12 @@ iso-image: .PHONY
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date
 
+iso-image-source: .PHONY
+	${MAKEDIRTARGET} distrib iso_image CDSOURCE=true
+	${MAKEDIRTARGET} etc iso-image
+	@echo   "make ${.TARGET} started at:  ${START_TIME}"
+	@printf "make ${.TARGET} finished at: " && date
+
 #
 # Special components of the "make build" process.
 #
diff --git a/build.sh b/build.sh
index b1906a7e2455..09a9b53799d4 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.171 2007/06/26 12:59:38 apb Exp $
+#	$NetBSD: build.sh,v 1.172 2007/08/30 05:30:02 jnemeth Exp $
 #
 # Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -230,6 +230,7 @@ initdefaults()
 	do_sourcesets=false
 	do_syspkgs=false
 	do_iso_image=false
+	do_iso_image_source=false
 	do_params=false
 
 	# Create scratch directory
@@ -522,7 +523,8 @@ Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-D dest] [-j njob]
 			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.
     params              Display various make(1) parameters.
 
  Options:
@@ -769,6 +771,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%%=*}
@@ -1083,7 +1089,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.171 2007/06/26 12:59:38 apb Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.172 2007/08/30 05:30:02 jnemeth Exp $
 # with these arguments: ${_args}
 #
 EOF
@@ -1266,7 +1272,7 @@ main()
 			statusmsg "Successful make ${op}"
 			;;
 
-		obj|build|distribution|iso-image|release|sourcesets|syspkgs|params)
+		obj|build|distribution|iso-image|iso-image-source|release|sourcesets|syspkgs|params)
 			${runcmd} "${makewrapper}" ${parallel} ${op} ||
 			    bomb "Failed to make ${op}"
 			statusmsg "Successful make ${op}"