Module Name: src
Committed By: nia
Date: Wed Apr 24 11:29:35 UTC 2024
Modified Files:
src/distrib/amd64/cdroms: Makefile
src/distrib/cdrom: current.conf
src/distrib/common: Makefile.bootcd
src/distrib/i386/cdroms: Makefile
Added Files:
src/distrib/amd64/cdroms/installdvd: Makefile boot.cfg.in
src/distrib/i386/cdroms/installdvd: Makefile boot.cfg.in
Log Message:
Add "DVD" ISOs for x86 that don't have to follow CD size limitations.
These include all available sets.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/cdroms/installdvd/Makefile \
src/distrib/amd64/cdroms/installdvd/boot.cfg.in
cvs rdiff -u -r1.13 -r1.14 src/distrib/cdrom/current.conf
cvs rdiff -u -r1.46 -r1.47 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/cdroms/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/i386/cdroms/installdvd/Makefile \
src/distrib/i386/cdroms/installdvd/boot.cfg.in
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/Makefile
diff -u src/distrib/amd64/cdroms/Makefile:1.3 src/distrib/amd64/cdroms/Makefile:1.4
--- src/distrib/amd64/cdroms/Makefile:1.3 Tue Mar 6 21:52:44 2007
+++ src/distrib/amd64/cdroms/Makefile Wed Apr 24 11:29:34 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/03/06 21:52:44 bouyer Exp $
+# $NetBSD: Makefile,v 1.4 2024/04/24 11:29:34 nia Exp $
SUBDIR=
SUBDIR+= bootcd
SUBDIR+= bootcd-com
+SUBDIR+= installdvd
SUBDIR+= installcd
TARGETS+= release iso_image
Index: src/distrib/cdrom/current.conf
diff -u src/distrib/cdrom/current.conf:1.13 src/distrib/cdrom/current.conf:1.14
--- src/distrib/cdrom/current.conf:1.13 Wed Jan 24 09:04:40 2018
+++ src/distrib/cdrom/current.conf Wed Apr 24 11:29:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: current.conf,v 1.13 2018/01/24 09:04:40 skrll Exp $
+# $NetBSD: current.conf,v 1.14 2024/04/24 11:29:34 nia Exp $
#
# Makefile fragment for CD sets; includes config information.
@@ -32,6 +32,7 @@ CD_IMAGES+= multi-cd3-${ISO_RELEASE}
CD_IMAGES+= acorn32cd-${ISO_RELEASE}
CD_IMAGES+= algorcd-${ISO_RELEASE}
CD_IMAGES+= alphacd-${ISO_RELEASE}
+CD_IMAGES+= amd64dvd-${ISO_RELEASE}
CD_IMAGES+= amd64cd-${ISO_RELEASE}
CD_IMAGES+= amigacd-${ISO_RELEASE}
CD_IMAGES+= arccd-${ISO_RELEASE}
@@ -51,6 +52,7 @@ CD_IMAGES+= hppacd-${ISO_RELEASE}
CD_IMAGES+= hpcarmcd-${ISO_RELEASE}
CD_IMAGES+= hpcmipscd-${ISO_RELEASE}
CD_IMAGES+= hpcshcd-${ISO_RELEASE}
+CD_IMAGES+= i386dvd-${ISO_RELEASE}
CD_IMAGES+= i386cd-${ISO_RELEASE}
CD_IMAGES+= ibmnwscd-${ISO_RELEASE}
CD_IMAGES+= iyonix-${ISO_RELEASE}
@@ -159,6 +161,7 @@ BASE_PORTS.multi-cd3-${ISO_RELEASE}= cob
BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32
BASE_PORTS.algorcd-${ISO_RELEASE}=algor
BASE_PORTS.alphacd-${ISO_RELEASE}=alpha
+BASE_PORTS.amd64dvd-${ISO_RELEASE}=amd64
BASE_PORTS.amd64cd-${ISO_RELEASE}=amd64
BASE_PORTS.amigacd-${ISO_RELEASE}=amiga
BASE_PORTS.arccd-${ISO_RELEASE}=arc
@@ -176,6 +179,7 @@ BASE_PORTS.hp300cd-${ISO_RELEASE}=hp300
BASE_PORTS.hpcarmcd-${ISO_RELEASE}=hpcarm
BASE_PORTS.hpcmipscd-${ISO_RELEASE}=hpcmips
BASE_PORTS.hpcshcd-${ISO_RELEASE}=hpcsh
+BASE_PORTS.i386dvd-${ISO_RELEASE}=i386
BASE_PORTS.i386cd-${ISO_RELEASE}=i386
BASE_PORTS.iyonixcd-${ISO_RELEASE}=iyonix
BASE_PORTS.ibmnwscd-${ISO_RELEASE}=ibmnws
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.46 src/distrib/common/Makefile.bootcd:1.47
--- src/distrib/common/Makefile.bootcd:1.46 Tue Apr 23 20:37:07 2024
+++ src/distrib/common/Makefile.bootcd Wed Apr 24 11:29:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.46 2024/04/23 20:37:07 nia Exp $
+# $NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 nia Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -123,6 +123,8 @@ ECHO?= echo
.if ${CDRELEASE} == false
CDIMAGE= ${CDBASE}.iso
+.elif ${CDBASE:M*dvd}
+CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/dvd$//}-dvd.iso
.else
CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso
.endif
Index: src/distrib/i386/cdroms/Makefile
diff -u src/distrib/i386/cdroms/Makefile:1.4 src/distrib/i386/cdroms/Makefile:1.5
--- src/distrib/i386/cdroms/Makefile:1.4 Tue Mar 6 21:52:45 2007
+++ src/distrib/i386/cdroms/Makefile Wed Apr 24 11:29:34 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/03/06 21:52:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.5 2024/04/24 11:29:34 nia Exp $
SUBDIR=
SUBDIR+= bootcd
SUBDIR+= bootcd-com
+SUBDIR+= installdvd
SUBDIR+= installcd
TARGETS+= release iso_image
Added files:
Index: src/distrib/amd64/cdroms/installdvd/Makefile
diff -u /dev/null src/distrib/amd64/cdroms/installdvd/Makefile:1.1
--- /dev/null Wed Apr 24 11:29:35 2024
+++ src/distrib/amd64/cdroms/installdvd/Makefile Wed Apr 24 11:29:34 2024
@@ -0,0 +1,19 @@
+# $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"
Index: src/distrib/amd64/cdroms/installdvd/boot.cfg.in
diff -u /dev/null src/distrib/amd64/cdroms/installdvd/boot.cfg.in:1.1
--- /dev/null Wed Apr 24 11:29:35 2024
+++ src/distrib/amd64/cdroms/installdvd/boot.cfg.in Wed Apr 24 11:29:34 2024
@@ -0,0 +1,8 @@
+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
Index: src/distrib/i386/cdroms/installdvd/Makefile
diff -u /dev/null src/distrib/i386/cdroms/installdvd/Makefile:1.1
--- /dev/null Wed Apr 24 11:29:35 2024
+++ src/distrib/i386/cdroms/installdvd/Makefile Wed Apr 24 11:29:34 2024
@@ -0,0 +1,18 @@
+# $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"
Index: src/distrib/i386/cdroms/installdvd/boot.cfg.in
diff -u /dev/null src/distrib/i386/cdroms/installdvd/boot.cfg.in:1.1
--- /dev/null Wed Apr 24 11:29:35 2024
+++ src/distrib/i386/cdroms/installdvd/boot.cfg.in Wed Apr 24 11:29:34 2024
@@ -0,0 +1,8 @@
+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
