diff mbox

[for-4.9] ioemu-stubdom: don't link *-softmmu* and *-linux-user*

Message ID 20170512152106.12032-1-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu May 12, 2017, 3:21 p.m. UTC
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>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Julien Grall <Julien.Grall@arm.com>

Should fix
http://logs.test-lab.xenproject.org/osstest/logs/109330/build-amd64/5.ts-xen-build.log
---
 stubdom/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Wei Liu May 12, 2017, 4:23 p.m. UTC | #1
On Fri, May 12, 2017 at 04:21:06PM +0100, Wei Liu wrote:
> 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>

FTR Juergen told me on IRC:

Reviewed-by: Juergen Gross <jgross@suse.com>
Julien Grall May 15, 2017, 1:54 p.m. UTC | #2
Hi,

On 12/05/17 17:23, Wei Liu wrote:
> On Fri, May 12, 2017 at 04:21:06PM +0100, Wei Liu wrote:
>> 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>
>
> FTR Juergen told me on IRC:
>
> Reviewed-by: Juergen Gross <jgross@suse.com>

Release-acked-by: Julien Grall <julien.grall@arm.com>

Cheers,
Ian Jackson May 16, 2017, 10:29 a.m. UTC | #3
Julien Grall writes ("Re: [PATCH for-4.9] ioemu-stubdom: don't link *-softmmu* and *-linux-user*"):
> On 12/05/17 17:23, Wei Liu wrote:
> > On Fri, May 12, 2017 at 04:21:06PM +0100, Wei Liu wrote:
> >> 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>
> >
> > FTR Juergen told me on IRC:
> >
> > Reviewed-by: Juergen Gross <jgross@suse.com>
> 
> Release-acked-by: Julien Grall <julien.grall@arm.com>

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

I haven't analysed the race in detail but the explanation is plausible
and the change is at worst harmless.

Thanks,
Ian.
diff mbox

Patch

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