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

[Peter Maydell]

On 19 October 2017 at 10:15, Daniel P. Berrange <address@hidden> wrote:
> On Wed, Oct 18, 2017 at 02:40:23PM -0400, 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'.
>
> Yes this makes sense
>
>>
>> Signed-off-by: Aaron Lindsay <address@hidden>

> Reviewed-by: Daniel P. Berrange <address@hidden>

Thanks; applied to master as a buildfix.

-- PMM