Module Name: src
Committed By: martin
Date: Wed May 27 09:44:40 UTC 2015
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/common: Makefile.bootcd
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Do not default any CD_SETS - let the MD makefiles request them specifically.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.29 -r1.30 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.37 -r1.38 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.24 -r1.25 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/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.17 src/distrib/amd64/cdroms/Makefile.cdrom:1.18
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.17 Mon May 25 15:38:33 2015
+++ src/distrib/amd64/cdroms/Makefile.cdrom Wed May 27 09:44:40 2015
@@ -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 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
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
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.29 src/distrib/common/Makefile.bootcd:1.30
--- src/distrib/common/Makefile.bootcd:1.29 Wed May 27 09:27:40 2015
+++ src/distrib/common/Makefile.bootcd Wed May 27 09:44:40 2015
@@ -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/
CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.endif
-CD_SETS?= base modules etc
SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
.include <bsd.own.mk> # For PRINTOBJDIR
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.37 src/distrib/i386/cdroms/Makefile.cdrom:1.38
--- src/distrib/i386/cdroms/Makefile.cdrom:1.37 Mon May 25 15:38:33 2015
+++ src/distrib/i386/cdroms/Makefile.cdrom Wed May 27 09:44:40 2015
@@ -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 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
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
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.24 src/distrib/sparc64/cdroms/installcd/Makefile:1.25
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.24 Mon May 25 15:38:33 2015
+++ src/distrib/sparc64/cdroms/installcd/Makefile Wed May 27 09:44:40 2015
@@ -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>
