Obey MKKMOD=no.

From Rin Okuyama in PR install/50061.
This commit is contained in:
martin 2015-07-19 10:16:55 +00:00
parent 61131c0e5d
commit 0ae2127055
5 changed files with 28 additions and 11 deletions

View File

@ -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

View File

@ -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.${MACHINE},no-emul-boot,allow-multidot
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

View File

@ -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

View File

@ -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.${MACHINE},no-emul-boot,allow-multidot
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

View File

@ -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}