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

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

Browse Source
This commit is contained in:
dbj 2021-02-06 16:02:43 +00:00
parent 0b6b34c295
commit 751da7ebca
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
distrib/amd64/cdroms/Makefile.cdrom
View File

@ -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 @@ ${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi
${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

7
distrib/amd64/cdroms/bootcd-com/Makefile
View File

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