Module Name: src
Committed By: kre
Date: Thu May 9 03:41:05 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
No point testing if the spec file is empty before running makespec,
the previous commands guarantee that cannot be the case, so makespec
was never being run. Just run it unconditionally.
Seems to fix the build for me.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 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.50 src/distrib/common/Makefile.bootcd:1.51
--- src/distrib/common/Makefile.bootcd:1.50 Wed May 8 16:08:08 2024
+++ src/distrib/common/Makefile.bootcd Thu May 9 03:41:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.50 2024/05/08 16:08:08 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.51 2024/05/09 03:41:05 kre Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -322,7 +322,7 @@ image:
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
- if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
+ ${MAKESPEC} cdrom >> ${WORKSPEC}
${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
${CDIMAGE} cdrom
