Module Name: src
Committed By: snj
Date: Thu Oct 15 20:31:51 UTC 2015
Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-7-0]: Makefile.ramdisk
list.ramdisk
src/distrib/i386/ramdisks/common [netbsd-7-0]: Makefile.ramdisk
list.ramdisk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.12.1 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.19 -r1.19.4.1 src/distrib/amd64/ramdisks/common/list.ramdisk
cvs rdiff -u -r1.11 -r1.11.12.1 \
src/distrib/i386/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.25 -r1.25.4.1 src/distrib/i386/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.10 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.10.12.1
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.10 Tue Oct 16 08:23:20 2012
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Thu Oct 15 20:31:50 2015
@@ -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 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \
${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
Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.19 src/distrib/amd64/ramdisks/common/list.ramdisk:1.19.4.1
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.19 Sun Aug 10 20:07:41 2014
+++ src/distrib/amd64/ramdisks/common/list.ramdisk Thu Oct 15 20:31:50 2015
@@ -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/bootxx_lfsv2 us
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
Index: src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.11 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.11.12.1
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.11 Tue Oct 16 08:23:21 2012
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk Thu Oct 15 20:31:51 2015
@@ -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 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \
${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
Index: src/distrib/i386/ramdisks/common/list.ramdisk
diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.25 src/distrib/i386/ramdisks/common/list.ramdisk:1.25.4.1
--- src/distrib/i386/ramdisks/common/list.ramdisk:1.25 Sun Aug 10 20:07:41 2014
+++ src/distrib/i386/ramdisks/common/list.ramdisk Thu Oct 15 20:31:51 2015
@@ -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/bootxx_lfsv2 us
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
