 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.bootcd,v 1.47 2024/04/24 11:29:34 nia Exp $
+#	$NetBSD: Makefile.bootcd,v 1.48 2024/04/25 11:56:51 nia Exp $
+#
 # Makefile snipped to create a CD/DVD ISO
+#
 # XXX TODO:
 # 1) merge with src/distrib/cdrom
 # 2) teach makefs to add data from more than 1 directory (see below)
+#
 # Required variables:
 #	CDBASE		Basename of the iso
+#
 # Optional variables:
 @@ -43,27 +43,27 @@
+#
 BOOT?=		${DESTDIR}/usr/mdec/boot
 BOOTXX_CD9660?=	${DESTDIR}/usr/mdec/bootxx_cd9660
 CDRELEASE?=	false
 CDSOURCE?=	false
 CDDEV_POPULATE?=false
 .if ${CDRELEASE} == false
 CDROMS_RELEASEDIR?=	${MACHINE}/installation/cdrom
 .else
 CDROMS_RELEASEDIR?=	images
 .endif
 .if defined(CDRELEASE_NOISOS)
-CDRELEASE_EXCLUDE=	-s ',./installation/cdrom.*,,gp'
+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'
 CDRELEASE_EXCLUDE+=	-s ',./binary/sets/base64.${sufx},,gp'
 .  endfor
 .endif
 .if defined(CDRELEASE_NODEBUG)
 .  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'

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.installimage,v 1.10 2021/09/25 21:26:03 maya Exp $
+#	$NetBSD: Makefile.installimage,v 1.11 2024/04/25 11:56:51 nia Exp $
+#
 # Common Makefile to create a bootable installation image for USB flash etc.
+#
+#
 # Required variables:
 #	INSTIMGBASE
 #		Basename of the liveimage
+#
 # Optional variables:
 #	INSTIMAGEMB
 #		target image size in MB
 #		(if empty default IMAGEMB in Makefile.bootimage is used)
 @@ -36,27 +36,28 @@ SETS?=		gpufw modules base etc
 FSTAB_IN?=	${NETBSDSRCDIR}/distrib/common/bootimage/fstab.install.in
 USE_MBR?=	no
 .if ${USE_MBR} != "no"
 DISKPROTO_IN?=	${NETBSDSRCDIR}/distrib/common/bootimage/diskproto.noswap.mbr.in
 .else
 DISKPROTO_IN?=	${NETBSDSRCDIR}/distrib/common/bootimage/diskproto.noswap.in
 .endif
 # XXX: no permission info for makefs(8)
 IMGDIR_EXTRA=	${RELEASEDIR}/${RELEASEMACHINEDIR}	${RELEASEMACHINEDIR}
-IMGDIR_EXCLUDE= 	-s ',./installation/cdrom.*,,gp'
+IMGDIR_EXCLUDE+= 	-s ',./installation/floppy/.*,,gp'
 IMGDIR_EXCLUDE+= 	-s ',./installation/cdrom.*,,gp'
 IMGDIR_EXCLUDE+=	-s ',./installation/liveimage.*,,gp'
 IMGDIR_EXCLUDE+=	-s ',./installation/installimage.*,,gp'
 .if defined(MD_IMGDIR_EXCLUDE)
 IMGDIR_EXCLUDE+=	${MD_IMGDIR_EXCLUDE}
 .endif
 IMGBASE=        ${INSTIMGBASE}
 .include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.bootimage"
 # INSTIMG_RELEASEDIR specifies where to install ${INSTIMGBASE}.img.gz.
 # This should be passed from etc/Makefile or etc/etc.${MACHINE}/Makefile.inc
 # but also set default here for manual builds.

 @@ -1,21 +1,36 @@
-#	$NetBSD: Makefile,v 1.11 2024/04/23 20:37:08 nia Exp $
+#	$NetBSD: Makefile,v 1.12 2024/04/25 11:56:51 nia Exp $
+#
 # Install CD, to be made after 'build.sh release'
 # Requires populated $RELEASEDIR/${MACHINE}
 .include <bsd.own.mk>
 .include "${.CURDIR}/../Makefile.cdrom"
 CDBASE=		i386cd			# gives ${CDBASE}.iso
 CDRELEASE=	true                    # include $RELEASEDIR/$RELEASEMACHINEDIR
 CDRELEASE_NODEBUG=	true
 CDRELEASE_NOHTML=	true
 CDRELEASE_NOTESTS=	true
 CDBUILDEXTRA+=	boot.cfg		# Add boot.cfg file
 CLEANFILES+=	boot.cfg
 # already (probably) booting from CD if using this and the floppy images
 # are 20MB+ when combined
 CDRELEASE_EXCLUDE+=	-s ',./installation/floppy/.*,,gp'
 # MONOLITHIC (i386-only) was originally added to the release build
 # for upgrades from netbsd-5, and now primarily exists so the no-modules
 # build can continue to be tested.  this takes up 20MB+ space.
 .  for sufx in tgz tar.xz
 CDRELEASE_EXCLUDE+=	-s ',./binary/sets/kern-INSTALL.${sufx},,gp'
 CDRELEASE_EXCLUDE+=	-s ',./binary/sets/kern-MONOLITHIC.${sufx},,gp'
 .  endfor
 CDRELEASE_EXCLUDE+=	-s ',./binary/kernel/netbsd-INSTALL.gz,,gp'
 CDRELEASE_EXCLUDE+=	-s ',./binary/kernel/netbsd-MONOLITHIC.gz,,gp'
 prepare_md_post:
 	${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
 .include "${.CURDIR}/../../../common/Makefile.bootcd"