[src/netbsd-9]: src/distrib Pull up following revision(s) (requested by marti...

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

details:   https://anonhg.NetBSD.org/src/rev/2e311bb250b7
branches:  netbsd-9
changeset: 1000703:2e311bb250b7
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Aug 18 13:14:26 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #75):
        distrib/evbarm/instkernel/instkernel/Makefile: revision 1.32
        distrib/common/Makefile.mdset: revision 1.46
Allow individual MDSETTARGETS/MDSET_SUFFIXES to define optional dependencies
between themselves.
Use that to make netbsd-RPI_INSTALL.img depend on netbsd-RPI_INSTALL.bin,
resolving the parallel build race.

diffstat:

 distrib/common/Makefile.mdset                 |  4 ++--
 distrib/evbarm/instkernel/instkernel/Makefile |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 20515fa00ed4 -r 2e311bb250b7 distrib/common/Makefile.mdset
--- a/distrib/common/Makefile.mdset     Sun Aug 18 13:12:27 2019 +0000
+++ b/distrib/common/Makefile.mdset     Sun Aug 18 13:14:26 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mdset,v 1.43 2019/02/06 07:33:08 mrg Exp $
+#      $NetBSD: Makefile.mdset,v 1.43.2.1 2019/08/18 13:14:26 msaitoh Exp $
 #
 # Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
 #
@@ -94,7 +94,7 @@
 .for _S _C in ${MDSET_SUFFIXES.${_F}}          # {
 CLEANFILES+=   ${_KERNEL.${_K}.${_F}}.${_S}
 
-${_KERNEL.${_K}.${_F}}.${_S}: ${_KERNEL.${_K}.${_F}}
+${_KERNEL.${_K}.${_F}}.${_S}: ${_KERNEL.${_K}.${_F}} ${MDSET_.${_K}.${_F}.${_S}.deps}
 .if defined(${_C})
        ${${_C}}
 .else
diff -r 20515fa00ed4 -r 2e311bb250b7 distrib/evbarm/instkernel/instkernel/Makefile
--- a/distrib/evbarm/instkernel/instkernel/Makefile     Sun Aug 18 13:12:27 2019 +0000
+++ b/distrib/evbarm/instkernel/instkernel/Makefile     Sun Aug 18 13:14:26 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.31 2019/05/18 07:33:10 skrll Exp $
+#      $NetBSD: Makefile,v 1.31.2.1 2019/08/18 13:14:26 msaitoh Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -15,6 +15,7 @@
 .if ${i} == "RPI_INSTALL"
 MDSETTARGETS+=         ${i}    ${SSHRAMDISK}   netbsd-${i}
 MDSET_SUFFIXES.netbsd-${i}=    bin create-bin  img create-img
+MDSET_.RPI_INSTALL.netbsd-RPI_INSTALL.img.deps=        netbsd-RPI_INSTALL.bin
 .else
 MDSETTARGETS+=         ${i}    ${RAMDISK}      -
 .endif