Module Name: src
Committed By: christos
Date: Wed May 8 16:08:08 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Fail on incomplete mtree specs
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/distrib/common/Makefile.bootcd
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.49 src/distrib/common/Makefile.bootcd:1.50
--- src/distrib/common/Makefile.bootcd:1.49 Tue May 7 16:33:20 2024
+++ src/distrib/common/Makefile.bootcd Wed May 8 12:08:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.49 2024/05/07 20:33:20 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.50 2024/05/08 16:08:08 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -285,7 +285,7 @@ copy-releasedir:
fi; \
${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom" \
${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc \
- -F "${CUROBJDIR}/cdrom/etc/mtree" \
+ -F "${CUROBJDIR}/cdrom/etc/mtree" -xx \
-d "${DESTDIR:S,^$,/,}" ${set}
.endfor
if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then \
@@ -323,8 +323,9 @@ image:
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
- ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} \
- ${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+ ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
+ ${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
+ ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
