[Xen-changelog] [xen master] x86/shim: Fix parallel build following c/s 32b1d62887d0

[patchbot@xxxxxxx]

commit 060f4eee0fb408b316548775ab921e16b7acd0e0
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Mon Aug 5 14:48:21 2019 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Aug 5 19:01:48 2019 +0100

    x86/shim: Fix parallel build following c/s 32b1d62887d0
    
    Unfortunately, a parallel build from clean can fail in the following manner:
    
      xen.git$ make -j4 -C tools/firmware/xen-dir/
      make: Entering directory '/local/xen.git/tools/firmware/xen-dir'
      mkdir -p xen-root
      make: *** No rule to make target 
'xen-root/xen/arch/x86/configs/pvshim_defconfig', needed by 
'xen-root/xen/.config'.  Stop.
      make: *** Waiting for unfinished jobs....
    
    The rule for pvshim_defconfig needs to depend on the linkfarm, rather than
    $(D)/xen/.config specifically.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 tools/firmware/xen-dir/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/firmware/xen-dir/Makefile b/tools/firmware/xen-dir/Makefile
index 7435421251..697bbbd57b 100644
--- a/tools/firmware/xen-dir/Makefile
+++ b/tools/firmware/xen-dir/Makefile
@@ -41,7 +41,9 @@ linkfarm.stamp: $(DEP_DIRS) $(DEP_FILES) FORCE
 $(D): linkfarm.stamp
        $(MAKE) -C $(D)/xen distclean
 
-$(D)/xen/.config: $(D) $(D)/xen/arch/x86/configs/pvshim_defconfig
+$(D)/xen/arch/x86/configs/pvshim_defconfig: $(D)
+
+$(D)/xen/.config: $(D)/xen/arch/x86/configs/pvshim_defconfig
        $(MAKE) -C $(@D) KBUILD_DEFCONFIG=pvshim_defconfig XEN_CONFIG_EXPERT=y 
defconfig
 
 xen-shim: $(D)/xen/.config
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog