[src/netbsd-7-0]: src/distrib Pull up following revision(s) (requested by mar...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bf2a6434c069
branches:  netbsd-7-0
changeset: 801053:bf2a6434c069
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Oct 15 20:31:50 2015 +0000

description:
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.

diffstat:

 distrib/amd64/ramdisks/common/Makefile.ramdisk |  3 ++-
 distrib/amd64/ramdisks/common/list.ramdisk     |  3 ++-
 distrib/i386/ramdisks/common/Makefile.ramdisk  |  3 ++-
 distrib/i386/ramdisks/common/list.ramdisk      |  3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diffs (68 lines):

diff -r ed95bafcc352 -r bf2a6434c069 distrib/amd64/ramdisks/common/Makefile.ramdisk
--- a/distrib/amd64/ramdisks/common/Makefile.ramdisk    Thu Oct 15 20:11:33 2015 +0000
+++ b/distrib/amd64/ramdisks/common/Makefile.ramdisk    Thu Oct 15 20:31:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ramdisk,v 1.10 2012/10/16 08:23:20 apb Exp $
+#      $NetBSD: Makefile.ramdisk,v 1.10.12.1 2015/10/15 20:31:50 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
diff -r ed95bafcc352 -r bf2a6434c069 distrib/amd64/ramdisks/common/list.ramdisk
--- a/distrib/amd64/ramdisks/common/list.ramdisk        Thu Oct 15 20:11:33 2015 +0000
+++ b/distrib/amd64/ramdisks/common/list.ramdisk        Thu Oct 15 20:31:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list.ramdisk,v 1.19 2014/08/10 20:07:41 riz Exp $
+#      $NetBSD: list.ramdisk,v 1.19.4.1 2015/10/15 20:31:50 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
diff -r ed95bafcc352 -r bf2a6434c069 distrib/i386/ramdisks/common/Makefile.ramdisk
--- a/distrib/i386/ramdisks/common/Makefile.ramdisk     Thu Oct 15 20:11:33 2015 +0000
+++ b/distrib/i386/ramdisks/common/Makefile.ramdisk     Thu Oct 15 20:31:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.ramdisk,v 1.11 2012/10/16 08:23:21 apb Exp $
+#      $NetBSD: Makefile.ramdisk,v 1.11.12.1 2015/10/15 20:31:51 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
diff -r ed95bafcc352 -r bf2a6434c069 distrib/i386/ramdisks/common/list.ramdisk
--- a/distrib/i386/ramdisks/common/list.ramdisk Thu Oct 15 20:11:33 2015 +0000
+++ b/distrib/i386/ramdisks/common/list.ramdisk Thu Oct 15 20:31:50 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list.ramdisk,v 1.25 2014/08/10 20:07:41 riz Exp $
+#      $NetBSD: list.ramdisk,v 1.25.4.1 2015/10/15 20:31:51 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