Module Name: src
Committed By: nia
Date: Fri Apr 26 17:36:32 UTC 2024
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/installdvd: Makefile
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/i386/cdroms/installdvd: Makefile
src/distrib/sparc64/cdroms/installdvd: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/cdroms/installdvd/Makefile
cvs rdiff -u -r1.42 -r1.43 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/cdroms/installdvd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/cdroms/installdvd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.27 src/distrib/amd64/cdroms/Makefile.cdrom:1.28
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.27 Sat Sep 25 08:54:29 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Apr 26 17:36:32 2024
@@ -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.$
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
Index: src/distrib/amd64/cdroms/installdvd/Makefile
diff -u src/distrib/amd64/cdroms/installdvd/Makefile:1.1 src/distrib/amd64/cdroms/installdvd/Makefile:1.2
--- src/distrib/amd64/cdroms/installdvd/Makefile:1.1 Wed Apr 24 11:29:34 2024
+++ src/distrib/amd64/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -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/
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
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.42 src/distrib/i386/cdroms/Makefile.cdrom:1.43
--- src/distrib/i386/cdroms/Makefile.cdrom:1.42 Sat Sep 25 08:54:29 2021
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Apr 26 17:36:32 2024
@@ -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.$
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
Index: src/distrib/i386/cdroms/installdvd/Makefile
diff -u src/distrib/i386/cdroms/installdvd/Makefile:1.1 src/distrib/i386/cdroms/installdvd/Makefile:1.2
--- src/distrib/i386/cdroms/installdvd/Makefile:1.1 Wed Apr 24 11:29:34 2024
+++ src/distrib/i386/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -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 # inc
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
Index: src/distrib/sparc64/cdroms/installdvd/Makefile
diff -u src/distrib/sparc64/cdroms/installdvd/Makefile:1.1 src/distrib/sparc64/cdroms/installdvd/Makefile:1.2
--- src/distrib/sparc64/cdroms/installdvd/Makefile:1.1 Wed Apr 24 15:39:58 2024
+++ src/distrib/sparc64/cdroms/installdvd/Makefile Fri Apr 26 17:36:32 2024
@@ -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}
