Module Name: src
Committed By: msaitoh
Date: Sun Aug 18 13:14:26 UTC 2019
Modified Files:
src/distrib/common [netbsd-9]: Makefile.mdset
src/distrib/evbarm/instkernel/instkernel [netbsd-9]: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.2.1 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.31 -r1.31.2.1 \
src/distrib/evbarm/instkernel/instkernel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.43 src/distrib/common/Makefile.mdset:1.43.2.1
--- src/distrib/common/Makefile.mdset:1.43 Wed Feb 6 07:33:08 2019
+++ src/distrib/common/Makefile.mdset Sun Aug 18 13:14:26 2019
@@ -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 @@ _KERNEL.${_K}.${_F}:= ${_F}
.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
Index: src/distrib/evbarm/instkernel/instkernel/Makefile
diff -u src/distrib/evbarm/instkernel/instkernel/Makefile:1.31 src/distrib/evbarm/instkernel/instkernel/Makefile:1.31.2.1
--- src/distrib/evbarm/instkernel/instkernel/Makefile:1.31 Sat May 18 07:33:10 2019
+++ src/distrib/evbarm/instkernel/instkernel/Makefile Sun Aug 18 13:14:26 2019
@@ -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 @@ MDSETTARGETS=
.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
