 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.bootcd,v 1.32 2015/05/29 06:28:50 martin Exp $
+#	$NetBSD: Makefile.bootcd,v 1.33 2015/11/25 00:50:57 christos 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:
 @@ -64,26 +64,30 @@ SETS_DIR?=	${RELEASEDIR}/${RELEASEMACHIN
 .include <bsd.kernobj.mk>	# For KERNSRCDIR
 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 ${MKREPRO:Uno} == "yes"
 TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/param.h
 .endif
 .if ${MKUNPRIVED} == "no"
 CD_METALOG.unpriv=
 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
 @@ -271,27 +275,27 @@ image:
 	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
 	if [ -s ${WORKSPEC} ]; then specarg="-F ${WORKSPEC}"; fi;	\
 	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 $${specarg} 	\
-		${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+		${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
 	${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}

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile.bootimage,v 1.11 2015/05/08 17:46:03 riastradh Exp $
+#	$NetBSD: Makefile.bootimage,v 1.12 2015/11/25 00:50:57 christos Exp $
+#
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 @@ -117,26 +117,30 @@
 #		template file of disklabel -R
 #		(default: ${DISTRIBDIR}/common/bootimage/diskproto.in
 #		       or ${DISTRIBDIR}/common/bootimage/diskproto.mbr.in)
 #	OMIT_SWAPIMG
 #		no need to put swap partition into image (for USB stick)
 #		(default: no)
+#
 .include <bsd.own.mk> 		#
 .include <bsd.endian.mk>	# for TARGET_ENDIANNESS
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 .if ${MKREPRO:Uno} == "yes"
 TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/param.h
 .endif
 .if empty(IMGBASE)
 .BEGIN:
 	@echo "Error: IMGBASE is not set"
 	@false
 .endif
 # should be defined elsewhere?
 CAT?=		cat
 CHMOD?=		chmod
 CP?=		cp
 DD?=		dd
 MKDIR?=		mkdir -p
 RM?=		rm
 @@ -282,26 +286,27 @@ ${TARGETFS}: prepare_md_post
 .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
 	@echo Creating rootfs...
 	# XXX /var/spool/ftp/hidden is unreadable
 	${CHMOD} +r ${WORKDIR}/var/spool/ftp/hidden
 	${TOOL_MAKEFS} -M ${FSSIZE} -m ${FSSIZE}			\
 	    -B ${TARGET_ENDIANNESS}					\
 	    -F ${WORKSPEC} -N ${WORKDIR}/etc				\
 	    ${TIMESTAMP}						\
 	    ${IMGMAKEFSOPTIONS}						\
 	    ${WORKFS} ${WORKDIR}
 .if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} == "no"
 	${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${INSTALLBOOTOPTIONS} ${WORKFS} \
 	    ${WORKDIR}/usr/mdec/${PRIMARY_BOOT} ${SECONDARY_BOOT_ARG}
 .endif
 	@echo done.
 	mv ${WORKFS} ${.TARGET}
+#
 # definitions to create image
+#
 .if ${USE_MBR} != "no"