]> xenbits.xensource.com Git - xen.git/commitdiff
ioemu-stubdom: don't link *-softmmu* and *-linux-user*
authorWei Liu <wei.liu2@citrix.com>
Fri, 12 May 2017 15:21:06 +0000 (16:21 +0100)
committerWei Liu <wei.liu2@citrix.com>
Tue, 16 May 2017 11:38:56 +0000 (12:38 +0100)
They are generated by ./configure. Having them linked can cause race
between tools build and stubdom build.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Release-acked-by: Julien Grall <julien.grall@arm.com>
stubdom/Makefile

index 54a2bdda0ecec47b63b9a3d3203d8dccdfc29083..aef705dd1e7f68cf869b20dc9a6d226dc14c3a4e 100644 (file)
@@ -295,10 +295,12 @@ ioemu/linkfarm.stamp: $(XEN_ROOT)/tools/qemu-xen-traditional-dir
        $(buildmakevars2shellvars);                                             \
        cd ioemu;                                                               \
        src="$$XEN_ROOT/tools/qemu-xen-traditional-dir"; export src;            \
-       (cd $$src && find * -type d -print) | xargs mkdir -p;                   \
-       (cd $$src && find *     ! -type l  -type f  $(addprefix ! -name ,       \
+       (cd $$src && find * -type d                                             \
+               $(addprefix ! -path , '*-softmmu*' '*-linux-user*') -print)     \
+               | xargs mkdir -p;                                               \
+       (cd $$src && find *     ! -type l  -type f  $(addprefix ! -path ,       \
                        '*.[oda1]' 'config-*' config.mak qemu-dm qemu-img-xen   \
-                       '*.html' '*.pod'                                        \
+                       '*.html' '*.pod' '*-softmmu*' '*-linux-user*'           \
                        )) >linkfarm.stamp.tmp;                         \
        cmp -s linkfarm.stamp.tmp linkfarm.stamp &&                     \
                rm linkfarm.stamp.tmp || {                              \