Thu Oct 15 20:30:57 2015 UTC ()
Pull up following revision(s) (requested by martin in ticket #992):
distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.11
distrib/amd64/ramdisks/common/list.ramdisk: revision 1.20
distrib/i386/ramdisks/common/Makefile.ramdisk: revision 1.12
distrib/i386/ramdisks/common/list.ramdisk: revision 1.26
PR install/50311: missing gptmbr.bin on ramdisk based installs.
(snj)
diff -r1.10 -r1.10.10.1 src/distrib/amd64/ramdisks/common/Makefile.ramdisk
diff -r1.19 -r1.19.2.1 src/distrib/amd64/ramdisks/common/list.ramdisk
diff -r1.11 -r1.11.10.1 src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -r1.25 -r1.25.2.1 src/distrib/i386/ramdisks/common/list.ramdisk
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk 2012/10/16 08:23:20 1.10
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk 2015/10/15 20:30:57 1.10.10.1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.10 2012/10/16 08:23:20 apb Exp $
+# $NetBSD: Makefile.ramdisk,v 1.10.10.1 2015/10/15 20:30:57 snj Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -25,6 +25,7 @@
${DESTDIR}/usr/mdec/mbr \
${DESTDIR}/usr/mdec/mbr_ext \
${DESTDIR}/usr/mdec/mbr_bootsel \
+ ${DESTDIR}/usr/mdec/gptmbr.bin \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
--- src/distrib/amd64/ramdisks/common/list.ramdisk 2014/08/10 20:07:41 1.19
+++ src/distrib/amd64/ramdisks/common/list.ramdisk 2015/10/15 20:30:57 1.19.2.1
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.19 2014/08/10 20:07:41 riz Exp $
+# $NetBSD: list.ramdisk,v 1.19.2.1 2015/10/15 20:30:57 snj Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -83,6 +83,7 @@
COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
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
# and the boot script
COPY ${CURDIR}/../common/dot.profile .profile
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk 2012/10/16 08:23:21 1.11
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk 2015/10/15 20:30:57 1.11.10.1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.11 2012/10/16 08:23:21 apb Exp $
+# $NetBSD: Makefile.ramdisk,v 1.11.10.1 2015/10/15 20:30:57 snj Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -24,6 +24,7 @@
${DESTDIR}/usr/mdec/mbr \
${DESTDIR}/usr/mdec/mbr_ext \
${DESTDIR}/usr/mdec/mbr_bootsel \
+ ${DESTDIR}/usr/mdec/gptmbr.bin \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
--- src/distrib/i386/ramdisks/common/list.ramdisk 2014/08/10 20:07:41 1.25
+++ src/distrib/i386/ramdisks/common/list.ramdisk 2015/10/15 20:30:57 1.25.2.1
@@ -1,4 +1,4 @@
-# $NetBSD: list.ramdisk,v 1.25 2014/08/10 20:07:41 riz Exp $
+# $NetBSD: list.ramdisk,v 1.25.2.1 2015/10/15 20:30:57 snj Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin libexec
@@ -83,6 +83,7 @@
COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr
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
# and the boot script
COPY ${CURDIR}/../common/dot.profile .profile