--dc+cDN39EJAMEtIO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

the recently added `iso-image' operation in src/build.sh does not work
because the operation's name was not added to the list of valid
operations in parseoptions(). Moreover, since `iso-image' is not a
valid shell variable name, it can't be used as an operation name in
build.sh: parseoptions() does a `eval do_${op}=true' which fails if
$op is `iso-image'...

The attached patch should fix these problems by renaming the operation
and target respectively to `isoimage' in src/build.sh and src/Makefile.


Cheers, Jukka

-- 
bashian roulette:
$ ((RANDOM%6)) || rm -rf ~

--dc+cDN39EJAMEtIO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: build.sh
===================================================================
RCS file: /cvsroot/src/build.sh,v
retrieving revision 1.145
diff -u -p -r1.145 build.sh
--- build.sh	28 Jan 2006 21:34:07 -0000	1.145
+++ build.sh	3 Feb 2006 09:31:47 -0000
@@ -128,6 +128,7 @@ initdefaults()
 	do_sets=false
 	do_sourcesets=false
 	do_syspkgs=false
+	do_isoimage=false
 	do_params=false
 
 	# Create scratch directory
@@ -378,6 +379,8 @@ 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.
+    isoimage            Create a CD-ROM image in
+                        RELEASEDIR/MACHINE/installation/cdrom.
     params              Display various make(1) parameters.
 
  Options:
@@ -617,7 +620,7 @@ parseoptions()
 			usage
 			;;
 
-		makewrapper|obj|tools|build|distribution|release|sets|sourcesets|syspkgs|params)
+		makewrapper|obj|tools|build|distribution|release|sets|sourcesets|syspkgs|isoimage|params)
 			;;
 
 		kernel=*|releasekernel=*)
@@ -1035,7 +1038,7 @@ main()
 			statusmsg "Successful make ${op}"
 			;;
 
-		obj|build|distribution|iso-image|release|sourcesets|syspkgs|params)
+		obj|build|distribution|release|sourcesets|syspkgs|isoimage|params)
 			${runcmd} "${makewrapper}" ${parallel} ${op} ||
 			    bomb "Failed to make ${op}"
 			statusmsg "Successful make ${op}"
Index: Makefile
===================================================================
RCS file: /cvsroot/src/Makefile,v
retrieving revision 1.243
diff -u -p -r1.243 Makefile
--- Makefile	28 Jan 2006 21:34:08 -0000	1.243
+++ Makefile	3 Feb 2006 09:31:47 -0000
@@ -61,7 +61,7 @@
 #	Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
 #   syspkgs:
 #	Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}
-#   iso-image:
+#   isoimage:
 #	Create CD-ROM image in RELEASEDIR/MACHINE/installation.
 #	RELEASEDIR must already have been populated by `make release'
 #	or equivalent.
@@ -313,7 +313,7 @@ release snapshot: .PHONY .MAKE
 # Create a CD-ROM image.
 #
 
-iso-image: .PHONY
+isoimage: .PHONY
 	${MAKEDIRTARGET} etc iso-image
 	@echo   "make ${.TARGET} started at:  ${START_TIME}"
 	@printf "make ${.TARGET} finished at: " && date

--dc+cDN39EJAMEtIO--