From b0b3d2327029893103923c308d1fbfaf94379fb6 Mon Sep 17 00:00:00 2001 From: Darek Stojaczyk Date: Tue, 12 Mar 2019 10:01:02 +0100 Subject: [PATCH] ocf: do not build ocf_inc and ocf_src concurrently Those targets use the same directories for temporary files and at the moment they race with each other. We're seeing intermittent failures on CI: ``` INSTALL [...]/ocf/env/src/ocf/utils/utils_list.c rm: missing operand ``` ``` INSTALL [...]/ocf/env/src/ocf/utils/utils_device.h INSTALL [...]/ocf/env/src/ocf/utils/utils_io.c rm: cannot remove [...]/ocf/env/src/ocf/utils': Directory not empty ``` Fixes #709 Change-Id: I9bf6ee7a97144afafbb643a0e350f38abe79270f Signed-off-by: Darek Stojaczyk Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/447750 Reviewed-by: Vitaliy Mysak Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- lib/bdev/ocf/env/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bdev/ocf/env/Makefile b/lib/bdev/ocf/env/Makefile index 5394ffde3..50184ca1a 100644 --- a/lib/bdev/ocf/env/Makefile +++ b/lib/bdev/ocf/env/Makefile @@ -75,7 +75,7 @@ all: ocf_inc ocf_src ocf_inc: $(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" inc O="$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/" --quiet -ocf_src: +ocf_src: ocf_inc $(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" src O="$(SPDK_ROOT_DIR)/lib/bdev/ocf/env/" CMD=cp --quiet ocf_distclean: