From 5abeaaee6ad367af6376ac9133e3119b4accd4c7 Mon Sep 17 00:00:00 2001
From: tv <tv@NetBSD.org>
Date: Wed, 17 Jan 2001 02:07:25 +0000
Subject: [PATCH] Add LOG_MKISOFS option to produce extra-verbose logs of the
 mkisofs image generation info (-v -v).

---
 distrib/cdrom/Makefile     | 8 ++++++--
 distrib/cdrom/example.conf | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/distrib/cdrom/Makefile b/distrib/cdrom/Makefile
index 602cf1aaf980..10a956be3f3d 100644
--- a/distrib/cdrom/Makefile
+++ b/distrib/cdrom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/11/30 21:33:41 tv Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/17 02:07:25 tv Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -349,7 +349,11 @@ size-${image}: stage-${image} extfileprep fileprep-${image}
 # Actually build the image with all the bootstrap goo....
 
 ${IMAGEDIR}/${image}.iso: fetch size-${image}
+.if defined(LOG_MKISOFS)
+	cd ${STAGEDIR}/${image} && ${MKISOFS} -o $@ ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} -v -v . >${IMAGEDIR}/${image}.iso.log 2>&1
+.else
 	cd ${STAGEDIR}/${image} && ${MKISOFS} -o $@ ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} .
+.endif
 .if !empty(SUN_BOOT_ARGS.${image})
 	${MKSUNBOOTCD} -c 640 $@ ${SUN_BOOT_ARGS.${image}}
 .endif
@@ -387,7 +391,7 @@ cleandir distclean: cleandistdir
 
 cleanimages:
 .for image in ${CD_IMAGES}
-	-rm -f ${IMAGEDIR}/${image}.iso
+	-rm -f ${IMAGEDIR}/${image}.iso ${IMAGEDIR}/${image}.iso.log
 .endfor
 
 cleanstagedir:
diff --git a/distrib/cdrom/example.conf b/distrib/cdrom/example.conf
index f74bf2c95fe6..2544988e177e 100644
--- a/distrib/cdrom/example.conf
+++ b/distrib/cdrom/example.conf
@@ -1,4 +1,4 @@
-# $NetBSD: example.conf,v 1.3 2000/11/30 21:28:32 tv Exp $
+# $NetBSD: example.conf,v 1.4 2001/01/17 02:07:25 tv Exp $
 #
 # Makefile fragment for CD sets; includes config information.
 
@@ -128,6 +128,11 @@ USE_JOLIET=	yes
 
 USE_APPLE_ISO=	yes
 
+# LOG_MKISOFS causes the mkisofs command to be logged in "extra verbose"
+# mode (-v -v) to the image filename with .log appended.
+
+#LOG_MKISOFS=	yes
+
 ##############################################################################
 # "Easter egg" file.  If this option is present, the standard 32k end padding
 # is replaced by a message in this file (no more than 16k), padded to 32k