Module Name: src Committed By: nia Date: Tue Apr 23 20:37:08 UTC 2024
Modified Files: src/distrib/common: Makefile.bootcd src/distrib/i386/cdroms/installcd: Makefile Log Message: Reduce the size of the i386 ISO to help it fit on a CD-ROM Exclude tests and html man pages. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/distrib/common/Makefile.bootcd cvs rdiff -u -r1.10 -r1.11 src/distrib/i386/cdroms/installcd/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/common/Makefile.bootcd diff -u src/distrib/common/Makefile.bootcd:1.45 src/distrib/common/Makefile.bootcd:1.46 --- src/distrib/common/Makefile.bootcd:1.45 Tue Apr 23 12:25:57 2024 +++ src/distrib/common/Makefile.bootcd Tue Apr 23 20:37:07 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootcd,v 1.45 2024/04/23 12:25:57 nia Exp $ +# $NetBSD: Makefile.bootcd,v 1.46 2024/04/23 20:37:07 nia Exp $ # # Makefile snipped to create a CD/DVD ISO # @@ -58,6 +58,7 @@ CDRELEASE_EXCLUDE= -s ',./installation/c .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) @@ -68,6 +69,16 @@ CDRELEASE_EXCLUDE+= -s ',./binary/sets/d CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.${sufx},,gp' . endfor .endif +.if defined(CDRELEASE_NOHTML) +. for sufx in tgz tar.xz +CDRELEASE_EXCLUDE+= -s ',./binary/sets/manhtml.${sufx},,gp' +. endfor +.endif +.if defined(CDRELEASE_NOTESTS) +. for sufx in tgz tar.xz +CDRELEASE_EXCLUDE+= -s ',./binary/sets/tests.${sufx},,gp' +. endfor +.endif .if !defined(CDRELEASE_LIVEIMAGE) CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp' .endif Index: src/distrib/i386/cdroms/installcd/Makefile diff -u src/distrib/i386/cdroms/installcd/Makefile:1.10 src/distrib/i386/cdroms/installcd/Makefile:1.11 --- src/distrib/i386/cdroms/installcd/Makefile:1.10 Mon Sep 23 13:42:33 2019 +++ src/distrib/i386/cdroms/installcd/Makefile Tue Apr 23 20:37:08 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:33 christos Exp $ +# $NetBSD: Makefile,v 1.11 2024/04/23 20:37:08 nia Exp $ # # Install CD, to be made after 'build.sh release' @@ -10,6 +10,8 @@ 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