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

Introduce CDRELEASE_NODEBUG - if set, avoids putting debug sets in the 

ISO image.

Set this for sparc64 install CDs - many of the supported machines have
SCSI CD drives and it is impossible to get DVD replacements for those.

This is a pitty, but in the end a working install medium is more worth
than debug sets (which can be downloaded later).
This commit is contained in:
martin 2017-09-08 09:50:44 +00:00
parent b7d99074ac
commit 9dfe31c9a3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/common/Makefile.bootcd
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.bootcd,v 1.38 2017/02/16 02:37:32 christos Exp $
# $NetBSD: Makefile.bootcd,v 1.39 2017/09/08 09:50:44 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@ -14,6 +14,7 @@
# Optional variables:
# CDRELEASE Set to 'true' to include $RELEASEDIR/$MACHINE on the CD
# CDRELEASE_NOISOS Excludes installation/cdrom directory if set
# CDRELEASE_NODEBUG Excludes debug sets if set
# CDSOURCE Set to 'true' to include $RELEASEDIR/source on the CD
# CDEXTRA Set to a list of files or directories containing extra
# stuff to put on CD (set by build.sh -C flag)
@ -51,6 +52,9 @@ CDROMS_RELEASEDIR?= images
.if defined(CDRELEASE_NOISOS)
CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
.endif
.if defined(CDRELEASE_NODEBUG)
CDRELEASE_EXCLUDE=+ -s ',./binary/sets/debug.tgz,,gp' -s ',./binary/sets/xdebug.tgz,,gp'
.endif
.if !defined(CDRELEASE_LIVEIMAGE)
CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
.endif

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

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.28 2017/02/10 16:43:59 christos Exp $
# $NetBSD: Makefile,v 1.29 2017/09/08 09:50:45 martin Exp $
.include <bsd.own.mk>
@ -13,6 +13,7 @@ CD_SETS+= modules
SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
CDRELEASE_NOISOS= true
CDRELEASE_NODEBUG= true
CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR}
CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs
SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE}