[src/trunk]: src/distrib/amd64 MKREPRO_TIMESTAMP fixes for efiboot

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d47d8706b1ca
branches:  trunk
changeset: 821601:d47d8706b1ca
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 10 16:53:51 2017 +0000

description:
MKREPRO_TIMESTAMP fixes for efiboot

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom                |   7 +++++--
 distrib/amd64/uefi-installimage/Makefile.bootimage |  10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r 74e45b4233b8 -r d47d8706b1ca distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Fri Feb 10 16:46:55 2017 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Fri Feb 10 16:53:51 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.22 2017/02/10 16:43:59 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.23 2017/02/10 16:53:51 christos Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -7,6 +7,9 @@
 
 EFIBOOTIMG=    efiboot.img
 CLEANFILES+=   ${EFIBOOTIMG}
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+.endif
 
 # Need multidot for the boot loader to read kernel modules as it doesn't
 # understand rockridge.
@@ -24,7 +27,7 @@
        ${RM} -rf efiboot/EFI/boot
        ${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
        ${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
-       ${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} \
+       ${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
                -t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
 
 image_md_pre: ${EFIBOOTIMG}
diff -r 74e45b4233b8 -r d47d8706b1ca distrib/amd64/uefi-installimage/Makefile.bootimage
--- a/distrib/amd64/uefi-installimage/Makefile.bootimage        Fri Feb 10 16:46:55 2017 +0000
+++ b/distrib/amd64/uefi-installimage/Makefile.bootimage        Fri Feb 10 16:53:51 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootimage,v 1.2 2017/02/10 16:43:59 christos Exp $
+#      $NetBSD: Makefile.bootimage,v 1.3 2017/02/10 16:53:51 christos Exp $
 #
 # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui.  All rights reserved.
 #
@@ -136,8 +136,8 @@
 
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
-.if ${MKREPRO:Uno} == "yes"
-TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/param.h
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
 .endif
 
 .if empty(IMGBASE)
@@ -341,7 +341,7 @@
        ${TOOL_MAKEFS} -M ${FSSIZE} -m ${FSSIZE}                        \
            -B ${TARGET_ENDIANNESS}                                     \
            -F ${WORKSPEC} -N ${WORKDIR}/etc                            \
-           ${TIMESTAMP}                                                \
+           ${MAKEFS_TIMESTAMP}                                         \
            ${IMGMAKEFSOPTIONS}                                         \
            ${WORKFS} ${WORKDIR}
 .if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} == "no"
@@ -414,7 +414,7 @@
        ${RM} -f ${WORKEFI}
        ${TOOL_MAKEFS} -M ${EFIMB}m -m ${EFIMB}m                        \
            -B ${TARGET_ENDIANNESS}                                     \
-           ${TIMESTAMP}                                                \
+           ${MAKEFS_TIMESTAMP}                                         \
            -t msdos -o F=32,c=1                                        \
            ${WORKEFI} ${EFIWORKDIR}
        @echo create GPT image...