Module Name: src
Committed By: dbj
Date: Sun Mar 7 03:55:47 UTC 2021
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/cdroms/bootcd-com: Makefile
Log Message:
distrib/amd64/cdroms: honor CDBOOTOPTIONS when installing EFI bootloader
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.8 -r1.9 src/distrib/amd64/cdroms/bootcd-com/Makefile
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/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.25 src/distrib/amd64/cdroms/Makefile.cdrom:1.26
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.25 Wed Feb 17 08:49:54 2021
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sun Mar 7 03:55:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.25 2021/02/17 08:49:54 dbj Exp $
+# $NetBSD: Makefile.cdrom,v 1.26 2021/03/07 03:55:47 dbj Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -27,6 +27,12 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx
${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
Index: src/distrib/amd64/cdroms/bootcd-com/Makefile
diff -u src/distrib/amd64/cdroms/bootcd-com/Makefile:1.8 src/distrib/amd64/cdroms/bootcd-com/Makefile:1.9
--- src/distrib/amd64/cdroms/bootcd-com/Makefile:1.8 Wed Feb 17 08:49:55 2021
+++ src/distrib/amd64/cdroms/bootcd-com/Makefile Sun Mar 7 03:55:47 2021
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2021/02/17 08:49:55 dbj Exp $
+# $NetBSD: Makefile,v 1.9 2021/03/07 03:55:47 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
