Module Name: src
Committed By: martin
Date: Fri Sep 8 09:50:45 UTC 2017
Modified Files:
src/distrib/common: Makefile.bootcd
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.28 -r1.29 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/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.38 src/distrib/common/Makefile.bootcd:1.39
--- src/distrib/common/Makefile.bootcd:1.38 Thu Feb 16 02:37:32 2017
+++ src/distrib/common/Makefile.bootcd Fri Sep 8 09:50:44 2017
@@ -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
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.28 src/distrib/sparc64/cdroms/installcd/Makefile:1.29
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.28 Fri Feb 10 16:43:59 2017
+++ src/distrib/sparc64/cdroms/installcd/Makefile Fri Sep 8 09:50:45 2017
@@ -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}
