Tue Apr 23 20:37:08 2024 UTC (16d)
Reduce the size of the i386 ISO to help it fit on a CD-ROM

Exclude tests and html man pages.


(nia)
diff -r1.45 -r1.46 src/distrib/common/Makefile.bootcd
diff -r1.10 -r1.11 src/distrib/i386/cdroms/installcd/Makefile
cvs diff -r1.45 -r1.46 src/distrib/common/Makefile.bootcd (expand / switch to unified diff)

--- src/distrib/common/Makefile.bootcd 2024/04/23 12:25:57 1.45
+++ src/distrib/common/Makefile.bootcd 2024/04/23 20:37:07 1.46
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.bootcd,v 1.45 2024/04/23 12:25:57 nia Exp $ 1# $NetBSD: Makefile.bootcd,v 1.46 2024/04/23 20:37:07 nia Exp $
2# 2#
3# Makefile snipped to create a CD/DVD ISO 3# Makefile snipped to create a CD/DVD ISO
4# 4#
5 5
6# XXX TODO: 6# XXX TODO:
7# 1) merge with src/distrib/cdrom 7# 1) merge with src/distrib/cdrom
8# 2) teach makefs to add data from more than 1 directory (see below) 8# 2) teach makefs to add data from more than 1 directory (see below)
9 9
10# 10#
11# Required variables: 11# Required variables:
12# CDBASE Basename of the iso 12# CDBASE Basename of the iso
13# 13#
14# Optional variables: 14# Optional variables:
@@ -48,36 +48,47 @@ CDRELEASE?= false @@ -48,36 +48,47 @@ CDRELEASE?= false
48CDSOURCE?= false 48CDSOURCE?= false
49CDDEV_POPULATE?=false 49CDDEV_POPULATE?=false
50.if ${CDRELEASE} == false 50.if ${CDRELEASE} == false
51CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom 51CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom
52.else 52.else
53CDROMS_RELEASEDIR?= images 53CDROMS_RELEASEDIR?= images
54.endif 54.endif
55.if defined(CDRELEASE_NOISOS) 55.if defined(CDRELEASE_NOISOS)
56CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp' 56CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
57.endif 57.endif
58.if defined(CDRELEASE_NOCOMPAT) 58.if defined(CDRELEASE_NOCOMPAT)
59. for sufx in tgz tar.xz 59. for sufx in tgz tar.xz
60CDRELEASE_EXCLUDE+= -s ',./binary/sets/base32.${sufx},,gp' 60CDRELEASE_EXCLUDE+= -s ',./binary/sets/base32.${sufx},,gp'
 61CDRELEASE_EXCLUDE+= -s ',./binary/sets/base64.${sufx},,gp'
61. endfor 62. endfor
62.endif 63.endif
63.if defined(CDRELEASE_NODEBUG) 64.if defined(CDRELEASE_NODEBUG)
64. for sufx in tgz tar.xz 65. for sufx in tgz tar.xz
65CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.${sufx},,gp' 66CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.${sufx},,gp'
66CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug32.${sufx},,gp' 67CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug32.${sufx},,gp'
67CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug64.${sufx},,gp' 68CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug64.${sufx},,gp'
68CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.${sufx},,gp' 69CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.${sufx},,gp'
69. endfor 70. endfor
70.endif 71.endif
 72.if defined(CDRELEASE_NOHTML)
 73. for sufx in tgz tar.xz
 74CDRELEASE_EXCLUDE+= -s ',./binary/sets/manhtml.${sufx},,gp'
 75. endfor
 76.endif
 77.if defined(CDRELEASE_NOTESTS)
 78. for sufx in tgz tar.xz
 79CDRELEASE_EXCLUDE+= -s ',./binary/sets/tests.${sufx},,gp'
 80. endfor
 81.endif
71.if !defined(CDRELEASE_LIVEIMAGE) 82.if !defined(CDRELEASE_LIVEIMAGE)
72CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp' 83CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
73.endif 84.endif
74.if !defined(CDRELEASE_INSTALLIMAGE) 85.if !defined(CDRELEASE_INSTALLIMAGE)
75CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp' 86CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp'
76.endif 87.endif
77 88
78SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets 89SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
79 90
80.include <bsd.own.mk> # For PRINTOBJDIR 91.include <bsd.own.mk> # For PRINTOBJDIR
81.include <bsd.kernobj.mk> # For KERNSRCDIR 92.include <bsd.kernobj.mk> # For KERNSRCDIR
82 93
83DISTRIBVER!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh 94DISTRIBVER!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh
cvs diff -r1.10 -r1.11 src/distrib/i386/cdroms/installcd/Makefile (expand / switch to unified diff)

--- src/distrib/i386/cdroms/installcd/Makefile 2019/09/23 13:42:33 1.10
+++ src/distrib/i386/cdroms/installcd/Makefile 2024/04/23 20:37:08 1.11
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: Makefile,v 1.10 2019/09/23 13:42:33 christos Exp $ 1# $NetBSD: Makefile,v 1.11 2024/04/23 20:37:08 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= i386cd # gives ${CDBASE}.iso 10CDBASE= i386cd # gives ${CDBASE}.iso
11CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR 11CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
12CDRELEASE_NODEBUG= true 12CDRELEASE_NODEBUG= true
 13CDRELEASE_NOHTML= true
 14CDRELEASE_NOTESTS= true
13CDBUILDEXTRA+= boot.cfg # Add boot.cfg file 15CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
14CLEANFILES+= boot.cfg 16CLEANFILES+= boot.cfg
15 17
16prepare_md_post: 18prepare_md_post:
17 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg 19 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.CURDIR}/boot.cfg.in > boot.cfg
18 20
19.include "${.CURDIR}/../../../common/Makefile.bootcd" 21.include "${.CURDIR}/../../../common/Makefile.bootcd"