Put back -xx (this will break some archs but we'll fix them) and automatically

generate the spec for the machine-specific portions of the cdrom.

distrib/common/Makefile.bootcd

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.52 2024/05/09 16:09:03 christos Exp $
+#	$NetBSD: Makefile.bootcd,v 1.53 2024/05/14 14:58:05 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" 				\
+	    -xx -F "${CUROBJDIR}/cdrom/etc/mtree" 			\
 	    -d "${DESTDIR:S,^$,/,}" ${set}
 .endfor
 	if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then	\
@@ -322,8 +322,12 @@ image:
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
-	if [ ! -s ${WORKSPEC} ]; then ${MAKESPEC} cdrom > ${WORKSPEC}; fi
-	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} \
+	if [ ! -s ${WORKSPEC} ]; then \
+	    ${MAKESPEC} -d cdrom . > ${WORKSPEC}; \
+	else \
+	    ${MAKESPEC} -d cdrom ${MACHINE} >> ${WORKSPEC}; \
+	fi
+	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
 	    ${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
 	    ${CDIMAGE} cdrom