[src/trunk]: src/distrib Allow individual MDSETTARGETS/MDSET_SUFFIXES to defi...

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

details:   https://anonhg.NetBSD.org/src/rev/bf3d5fcbe6bf
branches:  trunk
changeset: 964686:bf3d5fcbe6bf
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 12 08:04:28 2019 +0000

description:
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 5e7386d5ef38 -r bf3d5fcbe6bf distrib/common/Makefile.mdset
--- a/distrib/common/Makefile.mdset     Mon Aug 12 07:59:17 2019 +0000
+++ b/distrib/common/Makefile.mdset     Mon Aug 12 08:04:28 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mdset,v 1.45 2019/08/11 17:50:26 martin Exp $
+#      $NetBSD: Makefile.mdset,v 1.46 2019/08/12 08:04:28 martin 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 5e7386d5ef38 -r bf3d5fcbe6bf distrib/evbarm/instkernel/instkernel/Makefile
--- a/distrib/evbarm/instkernel/instkernel/Makefile     Mon Aug 12 07:59:17 2019 +0000
+++ b/distrib/evbarm/instkernel/instkernel/Makefile     Mon Aug 12 08:04:28 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.31 2019/05/18 07:33:10 skrll Exp $
+#      $NetBSD: Makefile,v 1.32 2019/08/12 08:04:28 martin 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