Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
martin 2015-05-27 09:44:40 +00:00
parent 6e40120187
commit 3cf95378a5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distrib/amd64/cdroms/Makefile.cdrom
View File

@ -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> .include <bsd.own.mk>
@ -10,6 +10,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
CDINSTKERNEL= ../../instkernel CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true CDRELEASE_NOISOS= true
CD_SETS= base etc modules
image_md_pre: image_md_pre:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc

4
distrib/common/Makefile.bootcd
View File

@ -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 # Makefile snipped to create a CD/DVD ISO
# #
@ -32,7 +32,6 @@
# source name_on_cd # source name_on_cd
# CDRUNTIME files/directories to copy from $DESTDIR onto the CD # CDRUNTIME files/directories to copy from $DESTDIR onto the CD
# CD_SETS sets to be extracted 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) # SETS_DIR where the CD_SETS are found (default provided)
# source kernels are copied from ${CDINSTKERNEL} (or its obj dir) # 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 # note that as of yet, bootxx_cd9660 can't load kernel names of more than
@ -59,7 +58,6 @@ CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp' CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.endif .endif
CD_SETS?= base modules etc
SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
.include <bsd.own.mk> # For PRINTOBJDIR .include <bsd.own.mk> # For PRINTOBJDIR

3
distrib/i386/cdroms/Makefile.cdrom
View File

@ -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> .include <bsd.own.mk>
@ -10,6 +10,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
CDINSTKERNEL= ../../instkernel CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true CDRELEASE_NOISOS= true
CD_SETS= base etc modules
image_md_pre: image_md_pre:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh

3
distrib/sparc64/cdroms/installcd/Makefile
View File

@ -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 CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd
CD_SETS= base etc modules
# for PRINTOBJDIR # for PRINTOBJDIR
.include <bsd.own.mk> .include <bsd.own.mk>