Module Name: src
Committed By: martin
Date: Sun Jul 19 10:16:56 UTC 2015
Modified Files:
src/distrib/amd64: Makefile
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/i386: Makefile
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Obey MKKMOD=no.
>From Rin Okuyama in PR install/50061.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/Makefile
cvs rdiff -u -r1.19 -r1.20 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.10 -r1.11 src/distrib/i386/Makefile
cvs rdiff -u -r1.39 -r1.40 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.26 -r1.27 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/Makefile
diff -u src/distrib/amd64/Makefile:1.9 src/distrib/amd64/Makefile:1.10
--- src/distrib/amd64/Makefile:1.9 Mon Jan 12 19:40:48 2015
+++ src/distrib/amd64/Makefile Sun Jul 19 10:16:55 2015
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2015/01/12 19:40:48 snj Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/19 10:16:55 martin 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
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.19 src/distrib/amd64/cdroms/Makefile.cdrom:1.20
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.19 Thu May 28 09:51:31 2015
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sun Jul 19 10:16:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.19 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.20 2015/07/19 10:16:55 martin Exp $
.include <bsd.own.mk>
@@ -10,7 +10,10 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
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
Index: src/distrib/i386/Makefile
diff -u src/distrib/i386/Makefile:1.10 src/distrib/i386/Makefile:1.11
--- src/distrib/i386/Makefile:1.10 Tue Jul 16 02:10:43 2013
+++ src/distrib/i386/Makefile Sun Jul 19 10:16:55 2015
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2013/07/16 02:10:43 khorben Exp $
+# $NetBSD: Makefile,v 1.11 2015/07/19 10:16:55 martin 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
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.39 src/distrib/i386/cdroms/Makefile.cdrom:1.40
--- src/distrib/i386/cdroms/Makefile.cdrom:1.39 Thu May 28 09:51:31 2015
+++ src/distrib/i386/cdroms/Makefile.cdrom Sun Jul 19 10:16:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.39 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.40 2015/07/19 10:16:55 martin Exp $
.include <bsd.own.mk>
@@ -10,7 +10,10 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
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
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.26 src/distrib/sparc64/cdroms/installcd/Makefile:1.27
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.26 Thu May 28 09:51:31 2015
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Jul 19 10:16:56 2015
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.26 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile,v 1.27 2015/07/19 10:16:56 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}
