Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only install gptmbr.bin if USE_GPTMBR=yes

This commit is contained in:
jmcneill 2020-05-28 15:13:21 +00:00
parent 1052b1ffc3
commit 9555656604
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distrib/amd64/installimage/Makefile
View File

@ -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.efi
USE_MBR= yes
USE_GPT= yes
USE_GPTMBR= yes
CLEANFILES+= boot.cfg

5
distrib/common/bootimage/Makefile.bootimage
View File

@ -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"