Module Name: src
Committed By: nia
Date: Tue Apr 23 12:25:57 UTC 2024
Modified Files:
src/distrib/amd64/cdroms/installcd: Makefile
src/distrib/common: Makefile.bootcd
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Exclude compat sets from ISO images that struggle to fit on a CD-ROM
When debug is excluded, also exclude the compat debug sets.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/amd64/cdroms/installcd/Makefile
cvs rdiff -u -r1.44 -r1.45 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.31 -r1.32 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/installcd/Makefile
diff -u src/distrib/amd64/cdroms/installcd/Makefile:1.6 src/distrib/amd64/cdroms/installcd/Makefile:1.7
--- src/distrib/amd64/cdroms/installcd/Makefile:1.6 Mon Sep 23 13:42:30 2019
+++ src/distrib/amd64/cdroms/installcd/Makefile Tue Apr 23 12:25:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/09/23 13:42:30 christos Exp $
+# $NetBSD: Makefile,v 1.7 2024/04/23 12:25:57 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@@ -10,6 +10,7 @@
CDBASE= amd64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
+CDRELEASE_NOCOMPAT= true
CDBUILDEXTRA= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.44 src/distrib/common/Makefile.bootcd:1.45
--- src/distrib/common/Makefile.bootcd:1.44 Sun Oct 11 14:10:04 2020
+++ src/distrib/common/Makefile.bootcd Tue Apr 23 12:25:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.44 2020/10/11 14:10:04 jmcneill Exp $
+# $NetBSD: Makefile.bootcd,v 1.45 2024/04/23 12:25:57 nia Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -55,11 +55,18 @@ CDROMS_RELEASEDIR?= images
.if defined(CDRELEASE_NOISOS)
CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
.endif
+.if defined(CDRELEASE_NOCOMPAT)
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/base32.${sufx},,gp'
+. endfor
+.endif
.if defined(CDRELEASE_NODEBUG)
-CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tgz,,gp'
-CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.tgz,,gp'
-CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tar.xz,,gp'
-CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.tar.xz,,gp'
+. for sufx in tgz tar.xz
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug32.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug64.${sufx},,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.${sufx},,gp'
+. endfor
.endif
.if !defined(CDRELEASE_LIVEIMAGE)
CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.31 src/distrib/sparc64/cdroms/installcd/Makefile:1.32
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.31 Mon Sep 23 13:42:35 2019
+++ src/distrib/sparc64/cdroms/installcd/Makefile Tue Apr 23 12:25:57 2024
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2019/09/23 13:42:35 christos Exp $
+# $NetBSD: Makefile,v 1.32 2024/04/23 12:25:57 nia Exp $
.include <bsd.own.mk>
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
+CDRELEASE_NOCOMPAT= true
CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
CD_SETS= base etc
.if ${MKKMOD} != "no"
