Module Name: src
Committed By: jmcneill
Date: Thu May 28 15:13:21 UTC 2020
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Only install gptmbr.bin if USE_GPTMBR=yes
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.24 -r1.25 src/distrib/common/bootimage/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/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.11 src/distrib/amd64/installimage/Makefile:1.12
--- src/distrib/amd64/installimage/Makefile:1.11 Wed May 27 22:27:58 2020
+++ src/distrib/amd64/installimage/Makefile Thu May 28 15:13:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/05/27 22:27:58 maya Exp $
+# $NetBSD: Makefile,v 1.12 2020/05/28 15:13:21 jmcneill Exp $
.include <bsd.own.mk>
@@ -16,6 +16,7 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.
USE_MBR= yes
USE_GPT= yes
+USE_GPTMBR= yes
CLEANFILES+= boot.cfg
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.24 src/distrib/common/bootimage/Makefile.bootimage:1.25
--- src/distrib/common/bootimage/Makefile.bootimage:1.24 Sat Mar 21 14:19:26 2020
+++ src/distrib/common/bootimage/Makefile.bootimage Thu May 28 15:13:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.24 2020/03/21 14:19:26 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.25 2020/05/28 15:13:21 jmcneill Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -166,6 +166,7 @@ RM?= rm
#
USE_MBR?= no
USE_GPT?= no
+USE_GPTMBR?= no
USE_SUNLABEL?= no
INSTALLBOOT_AFTER_DISKLABEL?= no
@@ -549,8 +550,10 @@ ${IMGBASE}.img: ${WORKLABEL}
${IMGBASE}.img: ${TARGET_BLOCKS}
${CAT} ${TARGET_BLOCKS} > ${WORKIMG}
.if ${USE_GPT} != "no"
+.if ${USE_GPTMBR} != "no"
${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} biosboot -i 2 \
-c ${.OBJDIR}/${WORKDIR}/usr/mdec/gptmbr.bin
+.endif
${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} set -a bootme -i 2
.endif # USE_GPT != "no"
.if ${USE_SUNLABEL} != "no"
