Wed Apr 24 11:29:35 2024 UTC (15d)
Add "DVD" ISOs for x86 that don't have to follow CD size limitations.

These include all available sets.


(nia)
diff -r1.3 -r1.4 src/distrib/amd64/cdroms/Makefile
diff -r0 -r1.1 src/distrib/amd64/cdroms/installdvd/Makefile
diff -r0 -r1.1 src/distrib/amd64/cdroms/installdvd/boot.cfg.in
diff -r1.13 -r1.14 src/distrib/cdrom/current.conf
diff -r1.46 -r1.47 src/distrib/common/Makefile.bootcd
diff -r1.4 -r1.5 src/distrib/i386/cdroms/Makefile
diff -r0 -r1.1 src/distrib/i386/cdroms/installdvd/Makefile
diff -r0 -r1.1 src/distrib/i386/cdroms/installdvd/boot.cfg.in
cvs diff -r1.3 -r1.4 src/distrib/amd64/cdroms/Makefile (expand / switch to unified diff)

--- src/distrib/amd64/cdroms/Makefile 2007/03/06 21:52:44 1.3
+++ src/distrib/amd64/cdroms/Makefile 2024/04/24 11:29:34 1.4
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1# $NetBSD: Makefile,v 1.3 2007/03/06 21:52:44 bouyer Exp $ 1# $NetBSD: Makefile,v 1.4 2024/04/24 11:29:34 nia Exp $
2 2
3SUBDIR= 3SUBDIR=
4SUBDIR+= bootcd 4SUBDIR+= bootcd
5SUBDIR+= bootcd-com 5SUBDIR+= bootcd-com
 6SUBDIR+= installdvd
6SUBDIR+= installcd 7SUBDIR+= installcd
7 8
8TARGETS+= release iso_image 9TARGETS+= release iso_image
9 10
10.include <bsd.subdir.mk> 11.include <bsd.subdir.mk>
File Added: src/distrib/amd64/cdroms/installdvd/Makefile
#	$NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
#

# Install CD, to be made after 'build.sh release'
# Requires populated $RELEASEDIR/${MACHINE}

.include <bsd.own.mk>
.include "${.CURDIR}/../Makefile.cdrom"

CDBASE=		amd64dvd		# gives ${CDBASE}.iso
CDRELEASE=	true			# include $RELEASEDIR/$RELEASEMACHINEDIR
CDBUILDEXTRA=	boot.cfg		# Add boot.cfg file
CLEANFILES+=	boot.cfg

prepare_md_post:
	${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
		< ${.CURDIR}/boot.cfg.in > boot.cfg

.include "${.CURDIR}/../../../common/Makefile.bootcd"
File Added: src/distrib/amd64/cdroms/installdvd/boot.cfg.in
banner=Welcome to the NetBSD @@VERSION@@ installation DVD
banner================================================================================
banner=
banner=If you encounter a problem while booting, report a bug at
banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
menu=Drop to boot prompt:prompt
timeout=30
cvs diff -r1.13 -r1.14 src/distrib/cdrom/current.conf (expand / switch to unified diff)

--- src/distrib/cdrom/current.conf 2018/01/24 09:04:40 1.13
+++ src/distrib/cdrom/current.conf 2024/04/24 11:29:34 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: current.conf,v 1.13 2018/01/24 09:04:40 skrll Exp $ 1# $NetBSD: current.conf,v 1.14 2024/04/24 11:29:34 nia Exp $
2# 2#
3# Makefile fragment for CD sets; includes config information. 3# Makefile fragment for CD sets; includes config information.
4 4
5############################################################################## 5##############################################################################
6# The NetBSD release being packaged on this CD set. This also implies 6# The NetBSD release being packaged on this CD set. This also implies
7# inclusion of a config file for that release, named NetBSD-${CD_RELEASE}.mk. 7# inclusion of a config file for that release, named NetBSD-${CD_RELEASE}.mk.
8# That file defines the various per-port specifics for that release. 8# That file defines the various per-port specifics for that release.
9 9
10CD_RELEASE= current 10CD_RELEASE= current
11 11
12############################################################################## 12##############################################################################
13# The NetBSD release to be used in the .iso image filenames. Defaults to 13# The NetBSD release to be used in the .iso image filenames. Defaults to
14# ${CD_RELEASE} but can be overridden in the environment. 14# ${CD_RELEASE} but can be overridden in the environment.
@@ -22,45 +22,47 @@ ISO_RELEASE?= ${CD_RELEASE} @@ -22,45 +22,47 @@ ISO_RELEASE?= ${CD_RELEASE}
22 22
23CD_IMAGES= 23CD_IMAGES=
24.if defined(TARGET_CD_IMAGE) 24.if defined(TARGET_CD_IMAGE)
25.for targetcd in ${TARGET_CD_IMAGE} 25.for targetcd in ${TARGET_CD_IMAGE}
26CD_IMAGES= ${targetcd}-${ISO_RELEASE} 26CD_IMAGES= ${targetcd}-${ISO_RELEASE}
27.endfor 27.endfor
28.else 28.else
29CD_IMAGES+= multi-cd1-${ISO_RELEASE} 29CD_IMAGES+= multi-cd1-${ISO_RELEASE}
30CD_IMAGES+= multi-cd2-${ISO_RELEASE} 30CD_IMAGES+= multi-cd2-${ISO_RELEASE}
31CD_IMAGES+= multi-cd3-${ISO_RELEASE} 31CD_IMAGES+= multi-cd3-${ISO_RELEASE}
32CD_IMAGES+= acorn32cd-${ISO_RELEASE} 32CD_IMAGES+= acorn32cd-${ISO_RELEASE}
33CD_IMAGES+= algorcd-${ISO_RELEASE} 33CD_IMAGES+= algorcd-${ISO_RELEASE}
34CD_IMAGES+= alphacd-${ISO_RELEASE} 34CD_IMAGES+= alphacd-${ISO_RELEASE}
 35CD_IMAGES+= amd64dvd-${ISO_RELEASE}
35CD_IMAGES+= amd64cd-${ISO_RELEASE} 36CD_IMAGES+= amd64cd-${ISO_RELEASE}
36CD_IMAGES+= amigacd-${ISO_RELEASE} 37CD_IMAGES+= amigacd-${ISO_RELEASE}
37CD_IMAGES+= arccd-${ISO_RELEASE}  38CD_IMAGES+= arccd-${ISO_RELEASE}
38CD_IMAGES+= ataricd-${ISO_RELEASE} 39CD_IMAGES+= ataricd-${ISO_RELEASE}
39CD_IMAGES+= catscd-${ISO_RELEASE} 40CD_IMAGES+= catscd-${ISO_RELEASE}
40CD_IMAGES+= cesficcd-${ISO_RELEASE} 41CD_IMAGES+= cesficcd-${ISO_RELEASE}
41CD_IMAGES+= cobaltcd-${ISO_RELEASE} 42CD_IMAGES+= cobaltcd-${ISO_RELEASE}
42CD_IMAGES+= dreamcastcd-${ISO_RELEASE} 43CD_IMAGES+= dreamcastcd-${ISO_RELEASE}
43CD_IMAGES+= evbarmcd-${ISO_RELEASE}  44CD_IMAGES+= evbarmcd-${ISO_RELEASE}
44CD_IMAGES+= evbmips-mipsebcd-${ISO_RELEASE} 45CD_IMAGES+= evbmips-mipsebcd-${ISO_RELEASE}
45CD_IMAGES+= evbmips-mipselcd-${ISO_RELEASE} 46CD_IMAGES+= evbmips-mipselcd-${ISO_RELEASE}
46CD_IMAGES+= evbppccd-${ISO_RELEASE} 47CD_IMAGES+= evbppccd-${ISO_RELEASE}
47CD_IMAGES+= evbsh3-sh3ebcd-${ISO_RELEASE}  48CD_IMAGES+= evbsh3-sh3ebcd-${ISO_RELEASE}
48CD_IMAGES+= evbsh3-sh3elcd-${ISO_RELEASE} 49CD_IMAGES+= evbsh3-sh3elcd-${ISO_RELEASE}
49CD_IMAGES+= hp300cd-${ISO_RELEASE} 50CD_IMAGES+= hp300cd-${ISO_RELEASE}
50CD_IMAGES+= hppacd-${ISO_RELEASE} 51CD_IMAGES+= hppacd-${ISO_RELEASE}
51CD_IMAGES+= hpcarmcd-${ISO_RELEASE} 52CD_IMAGES+= hpcarmcd-${ISO_RELEASE}
52CD_IMAGES+= hpcmipscd-${ISO_RELEASE} 53CD_IMAGES+= hpcmipscd-${ISO_RELEASE}
53CD_IMAGES+= hpcshcd-${ISO_RELEASE} 54CD_IMAGES+= hpcshcd-${ISO_RELEASE}
 55CD_IMAGES+= i386dvd-${ISO_RELEASE}
54CD_IMAGES+= i386cd-${ISO_RELEASE} 56CD_IMAGES+= i386cd-${ISO_RELEASE}
55CD_IMAGES+= ibmnwscd-${ISO_RELEASE} 57CD_IMAGES+= ibmnwscd-${ISO_RELEASE}
56CD_IMAGES+= iyonix-${ISO_RELEASE} 58CD_IMAGES+= iyonix-${ISO_RELEASE}
57CD_IMAGES+= luna68kcd-${ISO_RELEASE} 59CD_IMAGES+= luna68kcd-${ISO_RELEASE}
58CD_IMAGES+= mac68kcd-${ISO_RELEASE} 60CD_IMAGES+= mac68kcd-${ISO_RELEASE}
59CD_IMAGES+= macppccd-${ISO_RELEASE} 61CD_IMAGES+= macppccd-${ISO_RELEASE}
60CD_IMAGES+= mipscocd-${ISO_RELEASE} 62CD_IMAGES+= mipscocd-${ISO_RELEASE}
61CD_IMAGES+= mmeyecd-${ISO_RELEASE}  63CD_IMAGES+= mmeyecd-${ISO_RELEASE}
62CD_IMAGES+= mvmeppccd-${ISO_RELEASE} 64CD_IMAGES+= mvmeppccd-${ISO_RELEASE}
63CD_IMAGES+= mvme68kcd-${ISO_RELEASE} 65CD_IMAGES+= mvme68kcd-${ISO_RELEASE}
64CD_IMAGES+= netwindercd-${ISO_RELEASE} 66CD_IMAGES+= netwindercd-${ISO_RELEASE}
65CD_IMAGES+= news68kcd-${ISO_RELEASE} 67CD_IMAGES+= news68kcd-${ISO_RELEASE}
66CD_IMAGES+= newsmipscd-${ISO_RELEASE} 68CD_IMAGES+= newsmipscd-${ISO_RELEASE}
@@ -149,43 +151,45 @@ PREPARER= NetBSD CD Build System @@ -149,43 +151,45 @@ PREPARER= NetBSD CD Build System
149# * sgimips, i386 and amd64 must be on discs of their own 151# * sgimips, i386 and amd64 must be on discs of their own
150# 152#
151 153
152BASE_PORTS.multi-cd1-${ISO_RELEASE}= sparc sparc64 macppc 154BASE_PORTS.multi-cd1-${ISO_RELEASE}= sparc sparc64 macppc
153 155
154BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \ 156BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \
155 amiga atari mac68k next68k sun3 157 amiga atari mac68k next68k sun3
156 158
157BASE_PORTS.multi-cd3-${ISO_RELEASE}= cobalt hpcmips pmax # vax 159BASE_PORTS.multi-cd3-${ISO_RELEASE}= cobalt hpcmips pmax # vax
158 160
159BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32 161BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32
160BASE_PORTS.algorcd-${ISO_RELEASE}=algor 162BASE_PORTS.algorcd-${ISO_RELEASE}=algor
161BASE_PORTS.alphacd-${ISO_RELEASE}=alpha 163BASE_PORTS.alphacd-${ISO_RELEASE}=alpha
 164BASE_PORTS.amd64dvd-${ISO_RELEASE}=amd64
162BASE_PORTS.amd64cd-${ISO_RELEASE}=amd64 165BASE_PORTS.amd64cd-${ISO_RELEASE}=amd64
163BASE_PORTS.amigacd-${ISO_RELEASE}=amiga 166BASE_PORTS.amigacd-${ISO_RELEASE}=amiga
164BASE_PORTS.arccd-${ISO_RELEASE}=arc 167BASE_PORTS.arccd-${ISO_RELEASE}=arc
165BASE_PORTS.ataricd-${ISO_RELEASE}=atari 168BASE_PORTS.ataricd-${ISO_RELEASE}=atari
166BASE_PORTS.catscd-${ISO_RELEASE}=cats 169BASE_PORTS.catscd-${ISO_RELEASE}=cats
167BASE_PORTS.cesficcd-${ISO_RELEASE}=cesfic 170BASE_PORTS.cesficcd-${ISO_RELEASE}=cesfic
168BASE_PORTS.cobaltcd-${ISO_RELEASE}=cobalt 171BASE_PORTS.cobaltcd-${ISO_RELEASE}=cobalt
169BASE_PORTS.dreamcastcd-${ISO_RELEASE}=dreamcast 172BASE_PORTS.dreamcastcd-${ISO_RELEASE}=dreamcast
170BASE_PORTS.evbarmcd-${ISO_RELEASE}=evbarm 173BASE_PORTS.evbarmcd-${ISO_RELEASE}=evbarm
171BASE_PORTS.evbmips-mipsebcd-${ISO_RELEASE}=evbmips-mipseb 174BASE_PORTS.evbmips-mipsebcd-${ISO_RELEASE}=evbmips-mipseb
172BASE_PORTS.evbmips-mipselcd-${ISO_RELEASE}=evbmips-mipsel 175BASE_PORTS.evbmips-mipselcd-${ISO_RELEASE}=evbmips-mipsel
173BASE_PORTS.evbsh3-sh3ebcd-${ISO_RELEASE}=evbsh3-sh3eb 176BASE_PORTS.evbsh3-sh3ebcd-${ISO_RELEASE}=evbsh3-sh3eb
174BASE_PORTS.evbsh3-sh3elcd-${ISO_RELEASE}=evbsh3-sh3el 177BASE_PORTS.evbsh3-sh3elcd-${ISO_RELEASE}=evbsh3-sh3el
175BASE_PORTS.hp300cd-${ISO_RELEASE}=hp300 178BASE_PORTS.hp300cd-${ISO_RELEASE}=hp300
176BASE_PORTS.hpcarmcd-${ISO_RELEASE}=hpcarm 179BASE_PORTS.hpcarmcd-${ISO_RELEASE}=hpcarm
177BASE_PORTS.hpcmipscd-${ISO_RELEASE}=hpcmips 180BASE_PORTS.hpcmipscd-${ISO_RELEASE}=hpcmips
178BASE_PORTS.hpcshcd-${ISO_RELEASE}=hpcsh 181BASE_PORTS.hpcshcd-${ISO_RELEASE}=hpcsh
 182BASE_PORTS.i386dvd-${ISO_RELEASE}=i386
179BASE_PORTS.i386cd-${ISO_RELEASE}=i386 183BASE_PORTS.i386cd-${ISO_RELEASE}=i386
180BASE_PORTS.iyonixcd-${ISO_RELEASE}=iyonix 184BASE_PORTS.iyonixcd-${ISO_RELEASE}=iyonix
181BASE_PORTS.ibmnwscd-${ISO_RELEASE}=ibmnws 185BASE_PORTS.ibmnwscd-${ISO_RELEASE}=ibmnws
182BASE_PORTS.luna68kcd-${ISO_RELEASE}=luna68k 186BASE_PORTS.luna68kcd-${ISO_RELEASE}=luna68k
183BASE_PORTS.mac68kcd-${ISO_RELEASE}=mac68k 187BASE_PORTS.mac68kcd-${ISO_RELEASE}=mac68k
184BASE_PORTS.macppccd-${ISO_RELEASE}=macppc 188BASE_PORTS.macppccd-${ISO_RELEASE}=macppc
185BASE_PORTS.mipscocd-${ISO_RELEASE}=mipsco 189BASE_PORTS.mipscocd-${ISO_RELEASE}=mipsco
186BASE_PORTS.mmeyecd-${ISO_RELEASE}=mmeye 190BASE_PORTS.mmeyecd-${ISO_RELEASE}=mmeye
187BASE_PORTS.mvme68kcd-${ISO_RELEASE}=mvme68k 191BASE_PORTS.mvme68kcd-${ISO_RELEASE}=mvme68k
188BASE_PORTS.mvmeppccd-${ISO_RELEASE}=mvmeppc 192BASE_PORTS.mvmeppccd-${ISO_RELEASE}=mvmeppc
189BASE_PORTS.netwindercd-${ISO_RELEASE}=netwinder 193BASE_PORTS.netwindercd-${ISO_RELEASE}=netwinder
190BASE_PORTS.news68kcd-${ISO_RELEASE}=news68k 194BASE_PORTS.news68kcd-${ISO_RELEASE}=news68k
191BASE_PORTS.newsmipscd-${ISO_RELEASE}=newsmips 195BASE_PORTS.newsmipscd-${ISO_RELEASE}=newsmips
cvs diff -r1.46 -r1.47 src/distrib/common/Makefile.bootcd (expand / switch to unified diff)

--- src/distrib/common/Makefile.bootcd 2024/04/23 20:37:07 1.46
+++ src/distrib/common/Makefile.bootcd 2024/04/24 11:29:34 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.bootcd,v 1.46 2024/04/23 20:37:07 nia Exp $ 1# $NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 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:
@@ -113,26 +113,28 @@ mtunpriv= @@ -113,26 +113,28 @@ mtunpriv=
113.else 113.else
114CD_METALOG.unpriv=-M ${METALOG}.sanitised 114CD_METALOG.unpriv=-M ${METALOG}.sanitised
115mtunpriv="-U" 115mtunpriv="-U"
116.endif 116.endif
117 117
118# Stuff that should come from elsewhere - XXX where? - HF 118# Stuff that should come from elsewhere - XXX where? - HF
119RM?= rm 119RM?= rm
120MKDIR?= mkdir -p 120MKDIR?= mkdir -p
121CHMOD?= chmod 121CHMOD?= chmod
122ECHO?= echo 122ECHO?= echo
123 123
124.if ${CDRELEASE} == false 124.if ${CDRELEASE} == false
125CDIMAGE= ${CDBASE}.iso 125CDIMAGE= ${CDBASE}.iso
 126.elif ${CDBASE:M*dvd}
 127CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/dvd$//}-dvd.iso
126.else 128.else
127CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso 129CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso
128.endif 130.endif
129WORKSPEC= fs.spec 131WORKSPEC= fs.spec
130 132
131CLEANFILES+= ${CDIMAGE} 133CLEANFILES+= ${CDIMAGE}
132CLEANFILES+= bootxx.${MACHINE} 134CLEANFILES+= bootxx.${MACHINE}
133CLEANFILES+= ${WORKSPEC} 135CLEANFILES+= ${WORKSPEC}
134 136
135CDSETSENV= DESTDIR=${DESTDIR:Q} \ 137CDSETSENV= DESTDIR=${DESTDIR:Q} \
136 MACHINE=${MACHINE:Q} \ 138 MACHINE=${MACHINE:Q} \
137 MACHINE_ARCH=${MACHINE_ARCH:Q} \ 139 MACHINE_ARCH=${MACHINE_ARCH:Q} \
138 AWK=${TOOL_AWK:Q} \ 140 AWK=${TOOL_AWK:Q} \
cvs diff -r1.4 -r1.5 src/distrib/i386/cdroms/Makefile (expand / switch to unified diff)

--- src/distrib/i386/cdroms/Makefile 2007/03/06 21:52:45 1.4
+++ src/distrib/i386/cdroms/Makefile 2024/04/24 11:29:34 1.5
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1# $NetBSD: Makefile,v 1.4 2007/03/06 21:52:45 bouyer Exp $ 1# $NetBSD: Makefile,v 1.5 2024/04/24 11:29:34 nia Exp $
2 2
3SUBDIR= 3SUBDIR=
4SUBDIR+= bootcd 4SUBDIR+= bootcd
5SUBDIR+= bootcd-com 5SUBDIR+= bootcd-com
 6SUBDIR+= installdvd
6SUBDIR+= installcd 7SUBDIR+= installcd
7 8
8TARGETS+= release iso_image 9TARGETS+= release iso_image
9 10
10.include <bsd.subdir.mk> 11.include <bsd.subdir.mk>
File Added: src/distrib/i386/cdroms/installdvd/Makefile
#	$NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
#

# Install CD, to be made after 'build.sh release'
# Requires populated $RELEASEDIR/${MACHINE}

.include <bsd.own.mk>
.include "${.CURDIR}/../Makefile.cdrom"

CDBASE=		i386dvd			# gives ${CDBASE}.iso
CDRELEASE=	true                    # include $RELEASEDIR/$RELEASEMACHINEDIR
CDBUILDEXTRA+=	boot.cfg		# Add boot.cfg file
CLEANFILES+=	boot.cfg

prepare_md_post:
	${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg

.include "${.CURDIR}/../../../common/Makefile.bootcd"
File Added: src/distrib/i386/cdroms/installdvd/boot.cfg.in
banner=Welcome to the NetBSD @@VERSION@@ installation DVD
banner================================================================================
banner=
banner=If you encounter a problem while booting, report a bug at 
banner=https://www.NetBSD.org/.
menu=Install NetBSD:boot netbsd
menu=Drop to boot prompt:prompt
timeout=30