Fri Apr 26 17:36:32 2024 UTC (14d)
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.


(nia)
diff -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom
diff -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile
diff -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom
diff -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile
diff -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/Makefile
cvs diff -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom (expand / switch to unified diff)

--- src/distrib/amd64/cdroms/Makefile.cdrom 2021/09/25 08:54:29 1.27
+++ src/distrib/amd64/cdroms/Makefile.cdrom 2024/04/26 17:36:32 1.28
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: Makefile.cdrom,v 1.27 2021/09/25 08:54:29 maya Exp $ 1# $NetBSD: Makefile.cdrom,v 1.28 2024/04/26 17:36:32 nia Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include <bsd.endian.mk> 4.include <bsd.endian.mk>
5 5
6SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} 6SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
7 7
8EFIBOOTIMG= efiboot.img 8EFIBOOTIMG= efiboot.img
9CLEANFILES+= ${EFIBOOTIMG} 9CLEANFILES+= ${EFIBOOTIMG}
10.if ${MKREPRO_TIMESTAMP:Uno} != "no" 10.if ${MKREPRO_TIMESTAMP:Uno} != "no"
11MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}" 11MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
12.endif 12.endif
13 13
14# Need multidot for the boot loader to read kernel modules as it doesn't 14# Need multidot for the boot loader to read kernel modules as it doesn't
15# understand rockridge. 15# understand rockridge.
16CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot,bootimage=i386;${EFIBOOTIMG},platformid=efi,no-emul-boot 16CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot,bootimage=i386;${EFIBOOTIMG},platformid=efi,no-emul-boot
17CDINSTKERNEL= ../../instkernel 17CDINSTKERNEL= ../../instkernel
18CDKERNELS= netbsd-GENERIC.gz netbsd 18CDKERNELS= netbsd-GENERIC.gz netbsd
19CDRELEASE_NOISOS= true 19CDRELEASE_NOISOS= true
20CD_SETS= base etc gpufw 20CD_SETS+= base etc gpufw
21.if ${MKKMOD} != "no" 21.if ${MKKMOD} != "no"
22CD_SETS+= modules 22CD_SETS+= modules
23.endif 23.endif
24 24
25${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi 25${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi
26 ${RM} -f ${EFIBOOTIMG} 26 ${RM} -f ${EFIBOOTIMG}
27 ${RM} -rf efiboot/EFI/boot 27 ${RM} -rf efiboot/EFI/boot
28 ${MKDIR} ${MKDIRPERM} efiboot/EFI/boot 28 ${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
29 ${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/ 29 ${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
30.if defined(CDBOOTOPTIONS) 30.if defined(CDBOOTOPTIONS)
31 ${CHMOD} +w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi 31 ${CHMOD} +w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
32 ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootx64.efi 32 ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootx64.efi
33 ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootia32.efi 33 ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootia32.efi
cvs diff -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile (expand / switch to unified diff)

--- src/distrib/amd64/cdroms/installdvd/Makefile 2024/04/24 11:29:34 1.1
+++ src/distrib/amd64/cdroms/installdvd/Makefile 2024/04/26 17:36:32 1.2
@@ -1,19 +1,23 @@ @@ -1,19 +1,23 @@
1# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
2# 2#
3 3
4# Install CD, to be made after 'build.sh release' 4# Install CD, to be made after 'build.sh release'
5# Requires populated $RELEASEDIR/${MACHINE} 5# Requires populated $RELEASEDIR/${MACHINE}
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8.include "${.CURDIR}/../Makefile.cdrom" 8.include "${.CURDIR}/../Makefile.cdrom"
9 9
10CDBASE= amd64dvd # gives ${CDBASE}.iso 10CDBASE= amd64dvd # gives ${CDBASE}.iso
11CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR 11CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
12CDBUILDEXTRA= boot.cfg # Add boot.cfg file 12CDBUILDEXTRA= boot.cfg # Add boot.cfg file
13CLEANFILES+= boot.cfg 13CLEANFILES+= boot.cfg
14 14
 15.if ${MKMAN} != "no"
 16CD_SETS+= man
 17.endif
 18
15prepare_md_post: 19prepare_md_post:
16 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \ 20 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
17 < ${.CURDIR}/boot.cfg.in > boot.cfg 21 < ${.CURDIR}/boot.cfg.in > boot.cfg
18 22
19.include "${.CURDIR}/../../../common/Makefile.bootcd" 23.include "${.CURDIR}/../../../common/Makefile.bootcd"
cvs diff -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom (expand / switch to unified diff)

--- src/distrib/i386/cdroms/Makefile.cdrom 2021/09/25 08:54:29 1.42
+++ src/distrib/i386/cdroms/Makefile.cdrom 2024/04/26 17:36:32 1.43
@@ -1,26 +1,23 @@ @@ -1,26 +1,23 @@
1# $NetBSD: Makefile.cdrom,v 1.42 2021/09/25 08:54:29 maya Exp $ 1# $NetBSD: Makefile.cdrom,v 1.43 2024/04/26 17:36:32 nia Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} 5SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
6 6
7# Need multidot for the boot loader to read kernel modules as it doesn't 7# Need multidot for the boot loader to read kernel modules as it doesn't
8# understand rockridge. 8# understand rockridge.
9CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot 9CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
10CDINSTKERNEL= ../../instkernel 10CDINSTKERNEL= ../../instkernel
11CDKERNELS= netbsd-GENERIC.gz netbsd 11CDKERNELS= netbsd-GENERIC.gz netbsd
12CDRELEASE_NOISOS= true 12CDRELEASE_NOISOS= true
13CD_SETS= base etc gpufw 13CD_SETS+= base etc gpufw
14.if ${MKKMOD} != "no" 
15CD_SETS+= modules 
16.endif 
17 14
18image_md_pre: 15image_md_pre:
19 ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh 16 ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
20 ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab 17 ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
21 ${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys 18 ${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
22 ${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc 19 ${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
23 ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh 20 ${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
24 ${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot 21 ${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot
25 ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/ 22 ${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
26 ${MKDIR} ${MKDIRPERM} cdrom/var 23 ${MKDIR} ${MKDIRPERM} cdrom/var
cvs diff -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile (expand / switch to unified diff)

--- src/distrib/i386/cdroms/installdvd/Makefile 2024/04/24 11:29:34 1.1
+++ src/distrib/i386/cdroms/installdvd/Makefile 2024/04/26 17:36:32 1.2
@@ -1,18 +1,26 @@ @@ -1,18 +1,26 @@
1# $NetBSD: Makefile,v 1.1 2024/04/24 11:29:34 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
2# 2#
3 3
4# Install CD, to be made after 'build.sh release' 4# Install CD, to be made after 'build.sh release'
5# Requires populated $RELEASEDIR/${MACHINE} 5# Requires populated $RELEASEDIR/${MACHINE}
6 6
7.include <bsd.own.mk> 7.include <bsd.own.mk>
8.include "${.CURDIR}/../Makefile.cdrom" 8.include "${.CURDIR}/../Makefile.cdrom"
9 9
10CDBASE= i386dvd # gives ${CDBASE}.iso 10CDBASE= i386dvd # gives ${CDBASE}.iso
11CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR 11CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
12CDBUILDEXTRA+= boot.cfg # Add boot.cfg file 12CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
13CLEANFILES+= boot.cfg 13CLEANFILES+= boot.cfg
14 14
 15.if ${MKKMOD} != "no"
 16CD_SETS+= modules
 17.endif
 18
 19.if ${MKMAN} != "no"
 20CD_SETS+= man
 21.endif
 22
15prepare_md_post: 23prepare_md_post:
16 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg 24 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
17 25
18.include "${.CURDIR}/../../../common/Makefile.bootcd" 26.include "${.CURDIR}/../../../common/Makefile.bootcd"
cvs diff -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/Makefile (expand / switch to unified diff)

--- src/distrib/sparc64/cdroms/installdvd/Makefile 2024/04/24 15:39:58 1.1
+++ src/distrib/sparc64/cdroms/installdvd/Makefile 2024/04/26 17:36:32 1.2
@@ -1,24 +1,27 @@ @@ -1,24 +1,27 @@
1# $NetBSD: Makefile,v 1.1 2024/04/24 15:39:58 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2024/04/26 17:36:32 nia Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5CDBASE= sparc64dvd # gives ${CDBASE}.iso 5CDBASE= sparc64dvd # gives ${CDBASE}.iso
6CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR 6CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
7CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd 7CDKERNELS= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
8CD_SETS= base etc 8CD_SETS= base etc
9.if ${MKKMOD} != "no" 9.if ${MKKMOD} != "no"
10CD_SETS+= modules 10CD_SETS+= modules
11.endif 11.endif
 12.if ${MKMAN} != "no"
 13CD_SETS+= man
 14.endif
12 15
13SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR} 16SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
14 17
15CDRELEASE_NOISOS= true 18CDRELEASE_NOISOS= true
16CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR} 19CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR}
17CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs 20CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs
18SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE} 21SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE}
19 22
20image_md_pre: 23image_md_pre:
21 ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc 24 ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
22 ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab 25 ${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
23 ${INSTALL} ${COPY} ${.CURDIR}/../installcd/etc.ttys cdrom/etc/ttys 26 ${INSTALL} ${COPY} ${.CURDIR}/../installcd/etc.ttys cdrom/etc/ttys
24 ${INSTALL} ${COPY} ${.CURDIR}/../installcd/etc.rc cdrom/etc/rc 27 ${INSTALL} ${COPY} ${.CURDIR}/../installcd/etc.rc cdrom/etc/rc