Re: [Xen-devel] [VTPM v7 6/8] Add autoconf to stubdom

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2012-12-13 at 15:15 +0000, Matthew Fioravante wrote:
> On 12/13/2012 07:02 AM, Ian Campbell wrote:
> > On Thu, 2012-12-06 at 18:19 +0000, Matthew Fioravante wrote:
> >> Please rerun autoconf after commiting this patch
> >>
> >> Signed-off-by: Matthew Fioravante <matthew.fioravante@xxxxxxxxxx>
> > This fails for me with :
> >          
> > /local/scratch/ianc/devel/committer.git/stubdom/mini-os-x86_64-caml/test.o: 
> > In function `app_main':
> >          /local/scratch/ianc/devel/committer.git/extras/mini-os/test.c:511: 
> > multiple definition of `app_main'
> >          
> > /local/scratch/ianc/devel/committer.git/stubdom/mini-os-x86_64-caml/main.o:/local/scratch/ianc/devel/committer.git/extras/mini-os/main.c:187:
> >  first defined here
> >          make[2]: *** 
> > [/local/scratch/ianc/devel/committer.git/stubdom/mini-os-x86_64-caml/mini-os]
> >  Error 1
> >          make[2]: Leaving directory 
> > `/local/scratch/ianc/devel/committer.git/extras/mini-os'
> >          make[1]: *** [caml-stubdom] Error 2
> >          make[1]: Leaving directory 
> > `/local/scratch/ianc/devel/committer.git/stubdom'
> >          make: *** [install-stubdom] Error 2
> >
> > I'm only guessing it was this patch, but it was somewhere in this
> > series.
> Actually it looks like caml itself is just broken. The original stubdom 
> makefile did not include it as a build target but my configure.ac 
> erroneously enables it by default. The multiple definition problem 
> occurs because like c-stubdom its minios.cfg enables CONFIG_TEST which 
> defines a main function. It also defines a main function for itself.
> 
> Patch incoming

Thanks.
> > I'd already done all the autoconf faff and updated .*ignore for you
> > (adding autom4te.cache, config.log and config.status as appropriate). So
> > rather than resending please could you provide an incremental fix
> > against:
> >          git://xenbits.xen.org/people/ianc/xen-unstable.git vtpm
> >
> > I'll then merge that into the appropriate patch.
> >
> > It also occurs to me that this series introduces a little bisection blip
> > where cmake will be required (i.e. from patch 3 until here). The right
> > way to do this would have been to put the patch introducing autoconf at
> > the start. I'm inclined to just gloss over that for now, but if you feel
> > so inclined you could reorder things.
> I think the easiest way to fix this is to remove vtpm from the default 
> built targets in stubdom. That way if someone does does a make or a make 
> install in stubdom before autoconf they won't hit the cmake dependency.

You mean drop this hunk from "vtpm/vtpmmgr and required libs to
stubdom/Makefile":
@@ -74,12 +86,12 @@ TARGET_CPPFLAGS += -I$(XEN_ROOT)/xen/include

 TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib

-TARGETS=ioemu c caml grub xenstore
+TARGETS=ioemu c caml grub xenstore vtpm vtpmmgr

and re-do it later? That would work. I'd prefer to re-add it in a
completely new patch at the end rather than conflating this with the
autoconf switch.

Ian.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel