Module Name: src
Committed By: christos
Date: Fri Feb 10 16:53:51 UTC 2017
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
MKREPRO_TIMESTAMP fixes for efiboot
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.2 -r1.3 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.22 src/distrib/amd64/cdroms/Makefile.cdrom:1.23
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.22 Fri Feb 10 11:43:59 2017
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Feb 10 11:53:51 2017
@@ -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 @@ SYSINSTDIR!= cd ${.CURDIR}/../../../../u
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 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
${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}
Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.2 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.3
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.2 Fri Feb 10 11:43:59 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Fri Feb 10 11:53:51 2017
@@ -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 @@ ${TARGETFS}: prepare_md_post pre-targetf
${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 @@ ${IMGBASE}.img: ${TARGETFS}
${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...
