[Qemu-commits] [qemu/qemu] 005258: build: Fix dtc-checkout race condition in Makefile

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 00525864f2d89da1158b6b8c3e69ebf9e3398caa
      
https://github.com/qemu/qemu/commit/00525864f2d89da1158b6b8c3e69ebf9e3398caa
  Author: Aaron Lindsay <address@hidden>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  build: Fix dtc-checkout race condition in Makefile

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>
Reviewed-by: Daniel P. Berrange <address@hidden>
Acked-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>