[src/trunk]: src/distrib/amd64/cdroms distrib/amd64/cdroms: honor CDBOOTOPTIO...

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

details:   https://anonhg.NetBSD.org/src/rev/120803eeb95e
branches:  trunk
changeset: 951576:120803eeb95e
user:      dbj <dbj%NetBSD.org@localhost>
date:      Sat Feb 06 16:02:43 2021 +0000

description:
distrib/amd64/cdroms: honor CDBOOTOPTIONS when installing EFI bootloader

diffstat:

 distrib/amd64/cdroms/Makefile.cdrom      |  8 +++++++-
 distrib/amd64/cdroms/bootcd-com/Makefile |  7 ++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r f4c9685f3496 -r 120803eeb95e distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Sat Feb 06 16:02:16 2021 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Sat Feb 06 16:02:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.23 2017/02/10 16:53:51 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.24 2021/02/06 16:02:43 dbj Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -27,6 +27,12 @@
        ${RM} -rf efiboot/EFI/boot
        ${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
        ${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
+.if defined(CDBOOTOPTIONS)
+       ${CHMOD} +w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
+       ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootx64.efi
+       ${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} efiboot/EFI/boot/bootia32.efi
+       ${CHMOD} -w efiboot/EFI/boot/bootx64.efi efiboot/EFI/boot/bootia32.efi
+.endif
        ${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
                -t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
 
diff -r f4c9685f3496 -r 120803eeb95e distrib/amd64/cdroms/bootcd-com/Makefile
--- a/distrib/amd64/cdroms/bootcd-com/Makefile  Sat Feb 06 16:02:16 2021 +0000
+++ b/distrib/amd64/cdroms/bootcd-com/Makefile  Sat Feb 06 16:02:43 2021 +0000
@@ -1,11 +1,12 @@
-#      $NetBSD: Makefile,v 1.6 2019/05/15 13:47:41 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2021/02/06 16:02:43 dbj Exp $
 #
 
+# HP Proliant iLO serial console is on com1
+CDBOOTOPTIONS= -o console=com0
+
 .include "${.CURDIR}/../Makefile.cdrom"
 
 CDBASE=                boot-com                        # gives ${CDBASE}.iso
-# HP Proliant iLO serial console is on com1
-CDBOOTOPTIONS= -o console=com0
 
 CDBUILDEXTRA+= boot.cfg                # Add boot.cfg file
 CLEANFILES+=   boot.cfg