[src/trunk]: src/distrib Do not default any CD_SETS - let the MD makefiles re...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a02ce1fc19fa
branches:  trunk
changeset: 338485:a02ce1fc19fa
user:      martin <martin%NetBSD.org@localhost>
date:      Wed May 27 09:44:40 2015 +0000

description:
Do not default any CD_SETS - let the MD makefiles request them specifically.

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom       |  3 ++-
 distrib/common/Makefile.bootcd            |  4 +---
 distrib/i386/cdroms/Makefile.cdrom        |  3 ++-
 distrib/sparc64/cdroms/installcd/Makefile |  3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r caa5715f5041 -r a02ce1fc19fa distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Wed May 27 09:40:51 2015 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Wed May 27 09:44:40 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.17 2015/05/25 15:38:33 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.18 2015/05/27 09:44:40 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -10,6 +10,7 @@
 CDINSTKERNEL=  ../../instkernel
 CDKERNELS=     netbsd-GENERIC.gz       netbsd
 CDRELEASE_NOISOS=      true
+CD_SETS=       base etc modules
 
 image_md_pre:
        ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
diff -r caa5715f5041 -r a02ce1fc19fa distrib/common/Makefile.bootcd
--- a/distrib/common/Makefile.bootcd    Wed May 27 09:40:51 2015 +0000
+++ b/distrib/common/Makefile.bootcd    Wed May 27 09:44:40 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootcd,v 1.29 2015/05/27 09:27:40 martin Exp $
+#      $NetBSD: Makefile.bootcd,v 1.30 2015/05/27 09:44:40 martin Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -32,7 +32,6 @@
 #                              source  name_on_cd
 #      CDRUNTIME       files/directories to copy from $DESTDIR onto the CD
 #      CD_SETS         sets to be extracted onto the CD
-#                      (default: base modules etc)
 #      SETS_DIR        where the CD_SETS are found (default provided)
 # source kernels are copied from ${CDINSTKERNEL} (or its obj dir)
 # note that as of yet, bootxx_cd9660 can't load kernel names of more than
@@ -59,7 +58,6 @@
 CDRELEASE_EXCLUDE+=    -s ',./installation/installimage.*,,gp'
 .endif
 
-CD_SETS?=      base modules etc
 SETS_DIR?=     ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
 
 .include <bsd.own.mk>          # For PRINTOBJDIR
diff -r caa5715f5041 -r a02ce1fc19fa distrib/i386/cdroms/Makefile.cdrom
--- a/distrib/i386/cdroms/Makefile.cdrom        Wed May 27 09:40:51 2015 +0000
+++ b/distrib/i386/cdroms/Makefile.cdrom        Wed May 27 09:44:40 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.37 2015/05/25 15:38:33 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.38 2015/05/27 09:44:40 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -10,6 +10,7 @@
 CDINSTKERNEL=  ../../instkernel
 CDKERNELS=     netbsd-GENERIC.gz       netbsd
 CDRELEASE_NOISOS=      true
+CD_SETS=       base etc modules
 
 image_md_pre:
        ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
diff -r caa5715f5041 -r a02ce1fc19fa distrib/sparc64/cdroms/installcd/Makefile
--- a/distrib/sparc64/cdroms/installcd/Makefile Wed May 27 09:40:51 2015 +0000
+++ b/distrib/sparc64/cdroms/installcd/Makefile Wed May 27 09:44:40 2015 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile,v 1.24 2015/05/25 15:38:33 martin Exp $
+#      $NetBSD: Makefile,v 1.25 2015/05/27 09:44:40 martin Exp $
 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>