diff --git a/distrib/amd64/cdroms/Makefile b/distrib/amd64/cdroms/Makefile index df8db5c500cd..fa1431d8f33c 100644 --- a/distrib/amd64/cdroms/Makefile +++ b/distrib/amd64/cdroms/Makefile @@ -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 diff --git a/distrib/amd64/cdroms/installdvd/Makefile b/distrib/amd64/cdroms/installdvd/Makefile new file mode 100644 index 000000000000..e4efd6d76465 --- /dev/null +++ b/distrib/amd64/cdroms/installdvd/Makefile @@ -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 +.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" diff --git a/distrib/amd64/cdroms/installdvd/boot.cfg.in b/distrib/amd64/cdroms/installdvd/boot.cfg.in new file mode 100644 index 000000000000..ae703ab17685 --- /dev/null +++ b/distrib/amd64/cdroms/installdvd/boot.cfg.in @@ -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 diff --git a/distrib/cdrom/current.conf b/distrib/cdrom/current.conf index ac69c4120f3e..a497458efa3c 100644 --- a/distrib/cdrom/current.conf +++ b/distrib/cdrom/current.conf @@ -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}= cobalt hpcmips pmax # vax 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 diff --git a/distrib/common/Makefile.bootcd b/distrib/common/Makefile.bootcd index b9e07bcf9be2..35d8c32f7075 100644 --- a/distrib/common/Makefile.bootcd +++ b/distrib/common/Makefile.bootcd @@ -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 diff --git a/distrib/i386/cdroms/Makefile b/distrib/i386/cdroms/Makefile index 54d5c0a076ae..5dba96cb90ae 100644 --- a/distrib/i386/cdroms/Makefile +++ b/distrib/i386/cdroms/Makefile @@ -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 diff --git a/distrib/i386/cdroms/installdvd/Makefile b/distrib/i386/cdroms/installdvd/Makefile new file mode 100644 index 000000000000..e510042d2484 --- /dev/null +++ b/distrib/i386/cdroms/installdvd/Makefile @@ -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 +.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" diff --git a/distrib/i386/cdroms/installdvd/boot.cfg.in b/distrib/i386/cdroms/installdvd/boot.cfg.in new file mode 100644 index 000000000000..c81064b96139 --- /dev/null +++ b/distrib/i386/cdroms/installdvd/boot.cfg.in @@ -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