Module Name: src
Committed By: christos
Date: Tue May 7 20:33:20 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
PR/58196: Jan-Benedict Glaw: If there was no spec file specified, generate
one on the fly. Should fix reproducible builds where the mode and the
ownership/group is not fixed and picked up from the filesystem.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 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.48 src/distrib/common/Makefile.bootcd:1.49
--- src/distrib/common/Makefile.bootcd:1.48 Thu Apr 25 07:56:51 2024
+++ src/distrib/common/Makefile.bootcd Tue May 7 16:33:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.48 2024/04/25 11:56:51 nia Exp $
+# $NetBSD: Makefile.bootcd,v 1.49 2024/05/07 20:33:20 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -106,6 +106,7 @@ _CDMAKEFSOPTIONS= rockridge,label=${ISO_
MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
.endif
+MAKESPEC= ${HOST_SH} ${NETBSDSRCDIR}/etc/makespec
.if ${MKUNPRIVED} == "no"
CD_METALOG.unpriv=
@@ -321,8 +322,8 @@ image:
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
- if [ -s ${WORKSPEC} ]; then specarg="-F ${WORKSPEC}"; fi; \
- ${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 $${specarg} \
+ 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
.if ${CDRELEASE} == false
