Tue Apr 23 12:25:57 2024 UTC (16d)
Exclude compat sets from ISO images that struggle to fit on a CD-ROM

When debug is excluded, also exclude the compat debug sets.


(nia)
diff -r1.6 -r1.7 src/distrib/amd64/cdroms/installcd/Makefile
diff -r1.44 -r1.45 src/distrib/common/Makefile.bootcd
diff -r1.31 -r1.32 src/distrib/sparc64/cdroms/installcd/Makefile
cvs diff -r1.6 -r1.7 src/distrib/amd64/cdroms/installcd/Makefile (expand / switch to unified diff)

--- src/distrib/amd64/cdroms/installcd/Makefile 2019/09/23 13:42:30 1.6
+++ src/distrib/amd64/cdroms/installcd/Makefile 2024/04/23 12:25:57 1.7
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.6 2019/09/23 13:42:30 christos Exp $ 1# $NetBSD: Makefile,v 1.7 2024/04/23 12:25:57 nia Exp $
2# 2#
3 3
4# Install CD, to be made after 'build.sh release' 4# Install CD, to be made after 'build.sh release'
5# Requires populated $RELEASEDIR/${MACHINE} 5# Requires populated $RELEASEDIR/${MACHINE}
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8.include "${.CURDIR}/../Makefile.cdrom" 8.include "${.CURDIR}/../Makefile.cdrom"
9 9
10CDBASE= amd64cd # gives ${CDBASE}.iso 10CDBASE= amd64cd # gives ${CDBASE}.iso
11CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR 11CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
12CDRELEASE_NODEBUG= true 12CDRELEASE_NODEBUG= true
 13CDRELEASE_NOCOMPAT= true
13CDBUILDEXTRA= boot.cfg # Add boot.cfg file 14CDBUILDEXTRA= boot.cfg # Add boot.cfg file
14CLEANFILES+= boot.cfg 15CLEANFILES+= boot.cfg
15 16
16prepare_md_post: 17prepare_md_post:
17 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \ 18 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
18 < ${.CURDIR}/boot.cfg.in > boot.cfg 19 < ${.CURDIR}/boot.cfg.in > boot.cfg
19 20
20.include "${.CURDIR}/../../../common/Makefile.bootcd" 21.include "${.CURDIR}/../../../common/Makefile.bootcd"
cvs diff -r1.44 -r1.45 src/distrib/common/Makefile.bootcd (expand / switch to unified diff)

--- src/distrib/common/Makefile.bootcd 2020/10/11 14:10:04 1.44
+++ src/distrib/common/Makefile.bootcd 2024/04/23 12:25:57 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.bootcd,v 1.44 2020/10/11 14:10:04 jmcneill Exp $ 1# $NetBSD: Makefile.bootcd,v 1.45 2024/04/23 12:25:57 nia Exp $
2# 2#
3# Makefile snipped to create a CD/DVD ISO 3# Makefile snipped to create a CD/DVD ISO
4# 4#
5 5
6# XXX TODO: 6# XXX TODO:
7# 1) merge with src/distrib/cdrom 7# 1) merge with src/distrib/cdrom
8# 2) teach makefs to add data from more than 1 directory (see below) 8# 2) teach makefs to add data from more than 1 directory (see below)
9 9
10# 10#
11# Required variables: 11# Required variables:
12# CDBASE Basename of the iso 12# CDBASE Basename of the iso
13# 13#
14# Optional variables: 14# Optional variables:
@@ -45,31 +45,38 @@ @@ -45,31 +45,38 @@
45BOOT?= ${DESTDIR}/usr/mdec/boot 45BOOT?= ${DESTDIR}/usr/mdec/boot
46BOOTXX_CD9660?= ${DESTDIR}/usr/mdec/bootxx_cd9660 46BOOTXX_CD9660?= ${DESTDIR}/usr/mdec/bootxx_cd9660
47CDRELEASE?= false 47CDRELEASE?= false
48CDSOURCE?= false 48CDSOURCE?= false
49CDDEV_POPULATE?=false 49CDDEV_POPULATE?=false
50.if ${CDRELEASE} == false 50.if ${CDRELEASE} == false
51CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom 51CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom
52.else 52.else
53CDROMS_RELEASEDIR?= images 53CDROMS_RELEASEDIR?= images
54.endif 54.endif
55.if defined(CDRELEASE_NOISOS) 55.if defined(CDRELEASE_NOISOS)
56CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp' 56CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
57.endif 57.endif
 58.if defined(CDRELEASE_NOCOMPAT)
 59. for sufx in tgz tar.xz
 60CDRELEASE_EXCLUDE+= -s ',./binary/sets/base32.${sufx},,gp'
 61. endfor
 62.endif
58.if defined(CDRELEASE_NODEBUG) 63.if defined(CDRELEASE_NODEBUG)
59CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tgz,,gp' 64. for sufx in tgz tar.xz
60CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.tgz,,gp' 65CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.${sufx},,gp'
61CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tar.xz,,gp' 66CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug32.${sufx},,gp'
62CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.tar.xz,,gp' 67CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug64.${sufx},,gp'
 68CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.${sufx},,gp'
 69. endfor
63.endif 70.endif
64.if !defined(CDRELEASE_LIVEIMAGE) 71.if !defined(CDRELEASE_LIVEIMAGE)
65CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp' 72CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
66.endif 73.endif
67.if !defined(CDRELEASE_INSTALLIMAGE) 74.if !defined(CDRELEASE_INSTALLIMAGE)
68CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp' 75CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp'
69.endif 76.endif
70 77
71SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets 78SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
72 79
73.include <bsd.own.mk> # For PRINTOBJDIR 80.include <bsd.own.mk> # For PRINTOBJDIR
74.include <bsd.kernobj.mk> # For KERNSRCDIR 81.include <bsd.kernobj.mk> # For KERNSRCDIR
75 82
cvs diff -r1.31 -r1.32 src/distrib/sparc64/cdroms/installcd/Makefile (expand / switch to unified diff)

--- src/distrib/sparc64/cdroms/installcd/Makefile 2019/09/23 13:42:35 1.31
+++ src/distrib/sparc64/cdroms/installcd/Makefile 2024/04/23 12:25:57 1.32
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.31 2019/09/23 13:42:35 christos Exp $ 1# $NetBSD: Makefile,v 1.32 2024/04/23 12:25:57 nia Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5CDBASE= sparc64cd # gives ${CDBASE}.iso 5CDBASE= sparc64cd # gives ${CDBASE}.iso
6CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR 6CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
7CDRELEASE_NODEBUG= true 7CDRELEASE_NODEBUG= true
 8CDRELEASE_NOCOMPAT= true
8CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd 9CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
9CD_SETS= base etc 10CD_SETS= base etc
10.if ${MKKMOD} != "no" 11.if ${MKKMOD} != "no"
11CD_SETS+= modules 12CD_SETS+= modules
12.endif 13.endif
13 14
14SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} 15SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
15 16
16CDRELEASE_NOISOS= true 17CDRELEASE_NOISOS= true
17CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR} 18CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR}
18CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs 19CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs
19SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE} 20SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE}
20 21