 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.bootcd,v 1.30 2015/05/27 09:44:40 martin Exp $
+#	$NetBSD: Makefile.bootcd,v 1.31 2015/05/27 15:17:59 martin Exp $
+#
 # Makefile snipped to create a CD/DVD ISO
+#
 # XXX TODO:
 # 1) merge with src/distrib/cdrom
 # 2) teach makefs to add data from more than 1 directory (see below)
+#
 # Required variables:
 #	CDBASE		Basename of the iso
+#
 # Optional variables:
 @@ -66,46 +66,45 @@ SETS_DIR?=	${RELEASEDIR}/${RELEASEMACHIN
 DISTRIBVER!=	${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh
 DISTRIBREV!=	${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s
 CUROBJDIR!=	cd ${.CURDIR} && ${PRINTOBJDIR}
 ISO_VOLID!=	echo NETBSD_${DISTRIBREV} | tr a-z A-Z
 PUBLISHER?= The_NetBSD_Project
 .if defined(CDMAKEFSOPTIONS)
 _CDMAKEFSOPTIONS=	rockridge,label=${ISO_VOLID},publisher=${PUBLISHER},${CDMAKEFSOPTIONS}
 .else
 _CDMAKEFSOPTIONS=	rockridge,label=${ISO_VOLID},publisher=${PUBLISHER}
 .endif
 .if ${MKUNPRIVED} == "no"
 CD_METALOG.unpriv=
-mtunpriv=""
+mtunpriv=
 .else
 CD_METALOG.unpriv=-M ${METALOG}.sanitised
 mtunpriv="-U"
 .endif
 # Stuff that should come from elsewhere - XXX where? - HF
 CP?=		cp
 RM?=		rm
 MKDIR?=		mkdir -p
 CHMOD?=		chmod
 ECHO?=		echo
 .if ${CDRELEASE} == false
 CDIMAGE=	${CDBASE}.iso
 .else
 CDIMAGE=	NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso
 .endif
 WORKSPEC=	fs.spec
 CDMAKEFSEXTRAOPTS+=-F ${WORKSPEC}
 CLEANFILES+=	${CDIMAGE}
 CLEANFILES+=	bootxx.${MACHINE}
 CLEANFILES+=	${WORKSPEC}
 CDSETSENV=	DESTDIR=${DESTDIR:Q} \
 		MACHINE=${MACHINE:Q} \
 		MACHINE_ARCH=${MACHINE_ARCH:Q} \
 		AWK=${TOOL_AWK:Q} \
 		CKSUM=${TOOL_CKSUM:Q} \
 		DB=${TOOL_DB:Q} \
 		HOST_SH=${HOST_SH:Q} \
 		MAKE=${MAKE:Q} \
 @@ -250,42 +249,49 @@ copy-releasedir:
 	${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom"			\
 	    ${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc	\
 	    -F "${CUROBJDIR}/cdrom/etc/mtree"				\
 	    -d "${DESTDIR:S,^$,/,}" ${set}
 .endfor
 	if [ -d "${CUROBJDIR}/cdrom/var/spool/ftp/hidden" ]; then	\
 		${CHMOD} +r "${CUROBJDIR}/cdrom/var/spool/ftp/hidden";	\
 	fi
 .endif
 image:
 	@echo Preparing spec files for makefs...
 	${RM} -f ${WORKSPEC}
-	cat cdrom/etc/mtree/* |					\
+	if [ -d cdrom/etc/mtree ]; then				\
-	    ${TOOL_SED} -e 's/ size=[0-9]*//'				\
+		cat cdrom/etc/mtree/* |				\
-	     -e '/^\.\/etc\/gettytab/d' > ${WORKSPEC}
+		    ${TOOL_SED} -e 's/ size=[0-9]*//'		\
-	${HOST_SH} cdrom/dev/MAKEDEV -s all |			\
+		     -e '/^\.\/etc\/gettytab/d' > ${WORKSPEC};	\
-	    ${TOOL_SED} -e '/^\. type=dir/d' -e 's,^\.,./dev,' >> ${WORKSPEC}
+	fi
 	if [ -r cdrom/dev/MAKEDEV ]; then			\
 		${HOST_SH} cdrom/dev/MAKEDEV -s all |		\
 		    ${TOOL_SED} -e '/^\. type=dir/d' 		\
 			-e 's,^\.,./dev,' >> ${WORKSPEC};	\
 	fi
 .if defined(SPEC_IN)
 	cat ${SPEC_IN} >> ${WORKSPEC}
 .endif
 .if defined(SECONDARY_BOOT)
 	echo "./${SECONDARY_BOOT} type=file uname=root gname=wheel mode=0444" \
 	    >> ${WORKSPEC}
 .endif
 .if defined(SPEC_EXTRA)
 	cat ${SPEC_EXTRA} >> ${WORKSPEC}
 .endif
-	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+	if [ -s ${WORKSPEC} ]; then specarg="-F ${WORKSPEC}"; fi;	\
 	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 $${specarg} 	\
 		${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
 	${MKDIR} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
 	${RELEASE_INSTALL} ${CDIMAGE} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
 iso_image:
 .else
 release:
 iso_image: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
 	${MKDIR} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
 	${RELEASE_INSTALL} ${CDIMAGE} ${RELEASEDIR}/${CDROMS_RELEASEDIR}