[src/trunk]: src/distrib Only install gptmbr.bin if USE_GPTMBR=yes

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

details:   https://anonhg.NetBSD.org/src/rev/71302d64cdd1
branches:  trunk
changeset: 933693:71302d64cdd1
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu May 28 15:13:21 2020 +0000

description:
Only install gptmbr.bin if USE_GPTMBR=yes

diffstat:

 distrib/amd64/installimage/Makefile         |  3 ++-
 distrib/common/bootimage/Makefile.bootimage |  5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diffs (45 lines):

diff -r 025f898a464a -r 71302d64cdd1 distrib/amd64/installimage/Makefile
--- a/distrib/amd64/installimage/Makefile       Thu May 28 15:12:03 2020 +0000
+++ b/distrib/amd64/installimage/Makefile       Thu May 28 15:13:21 2020 +0000
@@ -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 @@
 
 USE_MBR=               yes
 USE_GPT=               yes
+USE_GPTMBR=            yes
 
 CLEANFILES+=   boot.cfg
 
diff -r 025f898a464a -r 71302d64cdd1 distrib/common/bootimage/Makefile.bootimage
--- a/distrib/common/bootimage/Makefile.bootimage       Thu May 28 15:12:03 2020 +0000
+++ b/distrib/common/bootimage/Makefile.bootimage       Thu May 28 15:13:21 2020 +0000
@@ -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 @@
 #
 USE_MBR?=      no
 USE_GPT?=      no
+USE_GPTMBR?=   no
 USE_SUNLABEL?= no
 INSTALLBOOT_AFTER_DISKLABEL?=  no
 
@@ -549,8 +550,10 @@
 ${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"