install/50061: build release fails with MKKMOD=yes for amd64/i386/sparc64

[okuyama%flex.phys.tohoku.ac.jp@localhost]

>Number:         50061
>Category:       install
>Synopsis:       build release fails with MKKMOD=yes for amd64/i386/sparc64
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    install-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 19 07:35:01 +0000 2015
>Originator:     Rin Okuyama
>Release:        7.99.20
>Organization:
Department of Physics, Tohoku University
>Environment:
NetBSD XXX 7.99.20 NetBSD 7.99.20 (XXX) #0: Sat Jul 18 23:38:38 JST 2015  root@XXX:/usr/src/sys/arch/amd64/compile/XXX amd64
>Description:
Build release fails with MKKMOD=yes for amd64, i386, or sparc64.
>How-To-Repeat:
Execute /usr/src/build.sh -m amd64 (or i386 or sparc64) release, with
MKKMOD=no in your /etc/mk.conf.
>Fix:
Check MKKMOD appropriately when building CD images.

--- src/distrib/amd64/cdroms/Makefile.cdrom.orig	2015-07-19 03:23:03.000000000 +0900
+++ src/distrib/amd64/cdroms/Makefile.cdrom	2015-07-19 03:23:40.000000000 +0900
@@ -10,7 +10,10 @@
 CDINSTKERNEL=	../../instkernel
 CDKERNELS=	netbsd-GENERIC.gz       netbsd
 CDRELEASE_NOISOS=	true
-CD_SETS=	base etc modules
+CD_SETS=	base etc
+.if ${MKKMOD} != "no"
+CD_SETS+=	modules
+.endif
 
 image_md_pre:
 	${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
--- src/distrib/amd64/Makefile.orig	2015-07-19 02:42:14.000000000 +0900
+++ src/distrib/amd64/Makefile	2015-07-19 03:12:47.000000000 +0900
@@ -1,11 +1,15 @@
 #	$NetBSD: Makefile,v 1.9 2015/01/12 19:40:48 snj Exp $
 
+.include <bsd.own.mk>
+
 SUBDIR=
 SUBDIR+=	ramdisks
 SUBDIR+=	.WAIT
 SUBDIR+=	instkernel
+.if ${MKKMOD} != "no"
 SUBDIR+=	kmod
 SUBDIR+=	kmod-cgdroot
+.endif
 SUBDIR+=	.WAIT
 SUBDIR+=	cdroms
 SUBDIR+=	liveimage
--- src/distrib/i386/cdroms/Makefile.cdrom.orig	2015-07-19 10:27:27.000000000 +0900
+++ src/distrib/i386/cdroms/Makefile.cdrom	2015-07-19 10:27:27.000000000 +0900
@@ -10,7 +10,10 @@
 CDINSTKERNEL=	../../instkernel
 CDKERNELS=	netbsd-GENERIC.gz       netbsd
 CDRELEASE_NOISOS=	true
-CD_SETS=	base etc modules
+CD_SETS=	base etc
+.if ${MKKMOD} != "no"
+CD_SETS+=	modules
+.endif
 
 image_md_pre:
 	${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
--- src/distrib/i386/Makefile.orig	2015-07-19 10:27:04.000000000 +0900
+++ src/distrib/i386/Makefile	2015-07-19 10:27:04.000000000 +0900
@@ -1,11 +1,15 @@
 #	$NetBSD: Makefile,v 1.10 2013/07/16 02:10:43 khorben Exp $
 
+.include <bsd.own.mk>
+
 SUBDIR=
 SUBDIR+=	ramdisks
 SUBDIR+=	.WAIT
 SUBDIR+=	instkernel
+.if ${MKKMOD} != "no"
 SUBDIR+=	kmod
 SUBDIR+=	kmod-cgdroot
+.endif
 SUBDIR+=	.WAIT
 SUBDIR+=	cdroms
 SUBDIR+=	floppies
--- src/distrib/sparc64/cdroms/installcd/Makefile.orig	2015-07-19 10:28:09.000000000 +0900
+++ src/distrib/sparc64/cdroms/installcd/Makefile	2015-07-19 10:28:09.000000000 +0900
@@ -1,11 +1,14 @@
 #	$NetBSD: Makefile,v 1.26 2015/05/28 09:51:31 martin Exp $
+
+.include <bsd.own.mk>
+
 CDBASE=		sparc64cd		# gives ${CDBASE}.iso
 CDRELEASE=	true			# include $RELEASEDIR/$MACHINE
 CDKERNELS=	${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz	netbsd
-CD_SETS=	base etc modules
-
-# for PRINTOBJDIR
-.include <bsd.own.mk>
+CD_SETS=	base etc
+.if ${MKKMOD} != "no"
+CD_SETS+=	modules
+.endif
 
 SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}