Module Name: src
Committed By: snj
Date: Wed Apr 13 03:39:23 UTC 2022
Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-9]: Makefile.ramdisk
list.ramdisk
Log Message:
Pull up following revision(s) (requested by martin in ticket #1436):
distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.16
distrib/amd64/ramdisks/common/list.ramdisk: revision 1.22
Add missing EFI bootloaders to the install kernel ramdisk,
noticed by Lloyd Parkes.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.21 -r1.21.2.1 src/distrib/amd64/ramdisks/common/list.ramdisk
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/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14.2.1
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14 Sun Jan 27 04:22:46 2019
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Wed Apr 13 03:39:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.14 2019/01/27 04:22:46 dholland Exp $
+# $NetBSD: Makefile.ramdisk,v 1.14.2.1 2022/04/13 03:39:23 snj Exp $
NOSANITIZER= # defined
@@ -28,6 +28,8 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \
${DESTDIR}/usr/mdec/mbr_ext \
${DESTDIR}/usr/mdec/mbr_bootsel \
${DESTDIR}/usr/mdec/gptmbr.bin \
+ ${DESTDIR}/usr/mdec/bootia32.efi \
+ ${DESTDIR}/usr/mdec/bootx64.efi \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 src/distrib/amd64/ramdisks/common/list.ramdisk:1.21.2.1
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.21 Mon Oct 1 17:50:08 2018
+++ src/distrib/amd64/ramdisks/common/list.ramdisk Wed Apr 13 03:39:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
+# $NetBSD: list.ramdisk,v 1.21.2.1 2022/04/13 03:39:23 snj Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -81,6 +81,8 @@ COPY ${DESTDIR}/usr/mdec/bootxx_ffsv1 us
COPY ${DESTDIR}/usr/mdec/bootxx_ffsv2 usr/mdec/bootxx_ffsv2
COPY ${DESTDIR}/usr/mdec/bootxx_lfsv2 usr/mdec/bootxx_lfsv2
COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
+COPY ${DESTDIR}/usr/mdec/bootia32.efi usr/mdec/bootia32.efi
+COPY ${DESTDIR}/usr/mdec/bootx64.efi usr/mdec/bootx64.efi
COPY ${DESTDIR}/usr/mdec/mbr_ext usr/mdec/mbr_ext
COPY ${DESTDIR}/usr/mdec/mbr_bootsel usr/mdec/mbr_bootsel
COPY ${DESTDIR}/usr/mdec/gptmbr.bin usr/mdec/gptmbr.bin
