Mon Jun 25 12:59:27 2018 UTC ()
Pull up following revision(s) (requested by martin in ticket #904):

	distrib/common/Makefile.bootcd: revision 1.40

Do not put debug.tgz and xdebug.tgz onto install CDs (a lot of them
grow out of bounds and for some architectures can not turn into DVDs).


(martin)
diff -r1.38 -r1.38.4.1 src/distrib/common/Makefile.bootcd
cvs diff -r1.38 -r1.38.4.1 src/distrib/common/Makefile.bootcd (expand / switch to unified diff)

--- src/distrib/common/Makefile.bootcd 2017/02/16 02:37:32 1.38
+++ src/distrib/common/Makefile.bootcd 2018/06/25 12:59:27 1.38.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.bootcd,v 1.38 2017/02/16 02:37:32 christos Exp $ 1# $NetBSD: Makefile.bootcd,v 1.38.4.1 2018/06/25 12:59:27 martin 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:
@@ -175,26 +175,28 @@ copy-releasedir: @@ -175,26 +175,28 @@ copy-releasedir:
175 ${RM} -f ${RELEASEDIR}/${CDROMS_RELEASEDIR}/${CDIMAGE} 175 ${RM} -f ${RELEASEDIR}/${CDROMS_RELEASEDIR}/${CDIMAGE}
176 if ${CDRELEASE}; then \ 176 if ${CDRELEASE}; then \
177 if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then \ 177 if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then \
178 echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \ 178 echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
179 exit 1; \ 179 exit 1; \
180 fi; \ 180 fi; \
181 ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/${MACHINE}"; \ 181 ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/${MACHINE}"; \
182 release_destdir="${CUROBJDIR}/cdrom/${MACHINE}"; \ 182 release_destdir="${CUROBJDIR}/cdrom/${MACHINE}"; \
183 cd ${RELEASEDIR}/${RELEASEMACHINEDIR}; \ 183 cd ${RELEASEDIR}/${RELEASEMACHINEDIR}; \
184 echo Copying $$(pwd) to $$release_destdir ...; \ 184 echo Copying $$(pwd) to $$release_destdir ...; \
185 ${TOOL_PAX} ${PAX_TIMESTAMP} \ 185 ${TOOL_PAX} ${PAX_TIMESTAMP} \
186 -rw -pe ${PAX_v} \ 186 -rw -pe ${PAX_v} \
187 ${CDRELEASE_EXCLUDE} \ 187 ${CDRELEASE_EXCLUDE} \
 188 -s ',./binary/sets/debug.tgz,,gp' \
 189 -s ',./binary/sets/xdebug.tgz,,gp' \
188 . $$release_destdir; \ 190 . $$release_destdir; \
189 cd "${CUROBJDIR}"; \ 191 cd "${CUROBJDIR}"; \
190 fi 192 fi
191 if ${CDSOURCE}; then \ 193 if ${CDSOURCE}; then \
192 if [ ! -d ${RELEASEDIR}/source ]; then \ 194 if [ ! -d ${RELEASEDIR}/source ]; then \
193 echo "Missing ${RELEASEDIR}/source, aborting"; \ 195 echo "Missing ${RELEASEDIR}/source, aborting"; \
194 exit 1; \ 196 exit 1; \
195 fi; \ 197 fi; \
196 ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/source"; \ 198 ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/source"; \
197 release_destdir="${CUROBJDIR}/cdrom/source"; \ 199 release_destdir="${CUROBJDIR}/cdrom/source"; \
198 cd ${RELEASEDIR}/source; \ 200 cd ${RELEASEDIR}/source; \
199 echo Copying $$(pwd) to $$release_destdir ...; \ 201 echo Copying $$(pwd) to $$release_destdir ...; \
200 ${TOOL_PAX} ${PAX_TIMESTAMP} \ 202 ${TOOL_PAX} ${PAX_TIMESTAMP} \