From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 12 May 2017 15:21:06 +0000 (+0100)
Subject: ioemu-stubdom: don't link *-softmmu* and *-linux-user*
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2153
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=36a049ff465f21c38f09e6e5e175c8311407f44c;p=xen.git

ioemu-stubdom: don't link *-softmmu* and *-linux-user*

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>
---

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 54a2bdda0e..aef705dd1e 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -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 || {				\