diff options
| author | snj <snj@NetBSD.org> | 2022-04-13 03:39:23 +0000 |
|---|---|---|
| committer | snj <snj@NetBSD.org> | 2022-04-13 03:39:23 +0000 |
| commit | 3337d398cbcfb34a91f8d2a214eb58d7111a85e6 (patch) | |
| tree | fa47e48d99817bcffdecd2578b4e3161c404633e /distrib | |
| parent | 41d553af4be5c2f8769be31c490ed507f14c7e1a (diff) | |
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.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/amd64/ramdisks/common/Makefile.ramdisk | 4 | ||||
| -rw-r--r-- | distrib/amd64/ramdisks/common/list.ramdisk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/distrib/amd64/ramdisks/common/Makefile.ramdisk b/distrib/amd64/ramdisks/common/Makefile.ramdisk index a4210591921..29680ebc5fe 100644 --- a/distrib/amd64/ramdisks/common/Makefile.ramdisk +++ b/distrib/amd64/ramdisks/common/Makefile.ramdisk @@ -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 diff --git a/distrib/amd64/ramdisks/common/list.ramdisk b/distrib/amd64/ramdisks/common/list.ramdisk index e8adb726c11..d0ed2cd72bd 100644 --- a/distrib/amd64/ramdisks/common/list.ramdisk +++ b/distrib/amd64/ramdisks/common/list.ramdisk @@ -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 usr/mdec/bootxx_ffsv1 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 |
