[src/trunk]: src/distrib/amd64/cdroms Revert "distrib/amd64/cdroms: honor CDB...

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

details:   https://anonhg.NetBSD.org/src/rev/19ff1b66f5a6
branches:  trunk
changeset: 959537:19ff1b66f5a6
user:      dbj <dbj%NetBSD.org@localhost>
date:      Wed Feb 17 08:49:54 2021 +0000

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

https://mail-index.netbsd.org/current-users/2021/02/17/msg040358.html
I think this change had unexpected side effects and needs further review

diffstat:

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

diffs (41 lines):

diff -r 72b78f9a7b6a -r 19ff1b66f5a6 distrib/amd64/cdroms/Makefile.cdrom
--- a/distrib/amd64/cdroms/Makefile.cdrom       Wed Feb 17 08:19:06 2021 +0000
+++ b/distrib/amd64/cdroms/Makefile.cdrom       Wed Feb 17 08:49:54 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.24 2021/02/06 16:02:43 dbj Exp $
+# $NetBSD: Makefile.cdrom,v 1.25 2021/02/17 08:49:54 dbj Exp $
 
 .include <bsd.own.mk>
 .include <bsd.endian.mk>
@@ -27,12 +27,6 @@
        ${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 72b78f9a7b6a -r 19ff1b66f5a6 distrib/amd64/cdroms/bootcd-com/Makefile
--- a/distrib/amd64/cdroms/bootcd-com/Makefile  Wed Feb 17 08:19:06 2021 +0000
+++ b/distrib/amd64/cdroms/bootcd-com/Makefile  Wed Feb 17 08:49:54 2021 +0000
@@ -1,12 +1,11 @@
-#      $NetBSD: Makefile,v 1.7 2021/02/06 16:02:43 dbj Exp $
+#      $NetBSD: Makefile,v 1.8 2021/02/17 08:49:55 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