Re: [Qemu-devel] [PATCH] build: Fix dtc-checkout race condition in Makefile

[Philippe Mathieu-Daudé]

On 10/18/2017 03:40 PM, Aaron Lindsay wrote:
> This was introduced by:
>     commit aef45d51d1204f3335fb99de6658e0c5612c2b67
>     Author: Daniel P. Berrange <address@hidden>
>     Date:   Fri Sep 29 11:11:56 2017 +0100
> 
>       build: automatically handle GIT submodule checkout for dtc
> 
> On my system, I see the following with a fresh clone:
> 
> % ./configure --disable-gtk --target-list=aarch64-softmmu
> % make -j8
>   GEN     aarch64-softmmu/config-devices.mak.tmp
>   GEN     config-host.h
> mkdir -p dtc/libfdt
>   GIT     ui/keycodemapdb dtc
> mkdir -p dtc/tests
>   GEN     qemu-options.def
> [snip]
>   GEN     migration/trace.h
> make: *** [git-submodule-update] Error 1
> make: *** Waiting for unfinished jobs....
> 
> Upon closer inspection, the root cause of the error is:
> 
> % git submodule update --init ui/keycodemapdb dtc
> fatal: destination path 'dtc' already exists and is not an empty directory.
> Clone of 'git://git.qemu-project.org/dtc.git' into submodule path 'dtc' failed
> 
> This patch fixes this race condition by forcing the 'dtc/%' rule which caused
> 'dtc' to be non-empty to wait on '.git-submodule-status'.
> 
> Signed-off-by: Aaron Lindsay <address@hidden>

Acked-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 90f91e5..ffa82e8 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -380,7 +380,7 @@ DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc 
> -I$(SRC_PATH)/dtc/libfdt
>  subdir-dtc: .git-submodule-status dtc/libfdt dtc/tests
>       $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) 
> CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" 
> ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) 
> libfdt/libfdt.a,)
>  
> -dtc/%:
> +dtc/%: .git-submodule-status
>       mkdir -p $@
>  
>  $(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \
>