git-lfs requires an external mutex (#4283)

diff --git a/src/bin/fuzzer.mk b/src/bin/fuzzer.mk
index c12c7ca6d011ba6a40f1cec72f80f03b20fb4ff9..ad30eeb6a06f6cf4283a5c042387b02817b39e7f 100644 (file)
--- a/src/bin/fuzzer.mk
+++ b/src/bin/fuzzer.mk
@@ -28,10 +28,13 @@ TGT_LDLIBS  := $(LIBS)
 #  Ensure that the large data file is copied from git-lfs,
 #  and then the files are extracted.
 #
+#  git-lfs fails to update the git index when multiple instances run
+#  concurrently.
+#
 .PHONY:src/tests/fuzzer-corpus/$(PROTOCOL)
 src/tests/fuzzer-corpus/$(PROTOCOL):
        ${Q}if [ ! -e $@ ]; then \
-               git -c 'lfs.fetchexclude=' -c 'lfs.fetchinclude=src/tests/fuzzer-corpus/$(PROTOCOL).tar' lfs pull; \
+               flock -F /tmp/git-lfs-mutex git -c 'lfs.fetchexclude=' -c 'lfs.fetchinclude=src/tests/fuzzer-corpus/$(PROTOCOL).tar' lfs pull; \
                cd src/tests/fuzzer-corpus; \
                tar -xf $(PROTOCOL).tar; \
        fi