Thu Apr 25 11:56:51 2024 UTC (38d)
remove redundant kernels and floppies from the space-starved i386 ISO
(nia)
diff -r1.47 -r1.48 src/distrib/common/Makefile.bootcd
diff -r1.10 -r1.11 src/distrib/common/bootimage/Makefile.installimage
diff -r1.11 -r1.12 src/distrib/i386/cdroms/installcd/Makefile
--- src/distrib/common/Makefile.bootcd 2024/04/24 11:29:34 1.47
+++ src/distrib/common/Makefile.bootcd 2024/04/25 11:56:51 1.48
@@ -1,4 +1,4 @@
-# $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
#
@@ -53,7 +53,7 @@
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
--- src/distrib/common/bootimage/Makefile.installimage 2021/09/25 21:26:03 1.10
+++ src/distrib/common/bootimage/Makefile.installimage 2024/04/25 11:56:51 1.11
@@ -1,4 +1,4 @@
-# $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.
#
@@ -46,7 +46,8 @@
# 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)
--- src/distrib/i386/cdroms/installcd/Makefile 2024/04/23 20:37:08 1.11
+++ src/distrib/i386/cdroms/installcd/Makefile 2024/04/25 11:56:51 1.12
@@ -1,4 +1,4 @@
-# $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'
@@ -14,6 +14,21 @@
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