Remove modules set from the i386 install cd

It is not particularly useful to be able to load modules while
installing on i386, probably the most useful one is dtrace,
and this takes up about 20mb on a port that is already exceeding
CD limits. Most stuff you'd want to use while installing is already
in GENERIC.

The modules set is still available compressed for installing into
a target system, meaning modules are available after installation.

While here, add man set to the installation DVD, it's helpful to be able
to read e.g. the man page for fdisk when rescuing a system.
pull/36/head
nia 2024-04-26 17:36:32 +00:00
parent 3a6d2122c6
commit df758d617b
5 changed files with 22 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cdrom,v 1.27 2021/09/25 08:54:29 maya Exp $
# $NetBSD: Makefile.cdrom,v 1.28 2024/04/26 17:36:32 nia Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@ -17,7 +17,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot,bo
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
CD_SETS= base etc gpufw
CD_SETS+= base etc gpufw
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@ -12,6 +12,10 @@ CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDBUILDEXTRA= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
.if ${MKMAN} != "no"
CD_SETS+= man
.endif
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
< ${.CURDIR}/boot.cfg.in > boot.cfg

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cdrom,v 1.42 2021/09/25 08:54:29 maya Exp $
# $NetBSD: Makefile.cdrom,v 1.43 2024/04/26 17:36:32 nia Exp $
.include <bsd.own.mk>
@ -10,10 +10,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
CD_SETS= base etc gpufw
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
CD_SETS+= base etc gpufw
image_md_pre:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $
# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
#
# Install CD, to be made after 'build.sh release'
@ -12,6 +12,14 @@ CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
.if ${MKMAN} != "no"
CD_SETS+= man
.endif
prepare_md_post:
${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2024/04/24 15:39:58 nia Exp $
# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
.include <bsd.own.mk>
@ -9,6 +9,9 @@ CD_SETS= base etc
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
.if ${MKMAN} != "no"
CD_SETS+= man
.endif
SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}