Re: [Xen-devel] [PATCH special] vtpm fix cmake dependency

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Tue, 2012-12-18 at 11:31 +0000, Ian Campbell wrote:
> On Thu, 2012-12-13 at 15:22 +0000, Matthew Fioravante wrote:
> > Ian, this one is special just for you. I'm sending it as an attachment 
> > because my email client will mangle it.
> > This patch will remove the cmake dependency from xen prior to autoconf 
> > stubdom
> 
> Thanks, I merged this as described and also folded "Disable caml-stubdom
> by default" into the patch which added it enabled.
> 
> However this still fails for me when vtpm is not enabled:
>         make[1]: *** No rule to make target `mini-os-x86_64-vtpm', needed by 
> `vtpm-stubdom'.  Stop.
>         make[1]: Leaving directory 
> `/local/scratch/ianc/devel/committer.git/stubdom'
>         make: *** [install-stubdom] Error 2
> 
> Something to with vtpmmgr not being conditional?

Looks like a simple thinko. I'll merge the following into "stubdom: Add
autoconf", hopefully my testing won't find any other issues.

Please try and remember to test both with and without any new option you
are adding in the future. 

Ian.


commit 569b8782415325b27897434f4893945769c45296
Author: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date:   Tue Dec 18 11:41:32 2012 +0000

    install-vtpmmgr should depend on vtpmmgrdom not vtpm-stubdom

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 709b71e..7519683 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -476,7 +476,7 @@ install-vtpm: vtpm-stubdom
        $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
        $(INSTALL_PROG) mini-os-$(XEN_TARGET_ARCH)-vtpm/mini-os.gz 
"$(DESTDIR)$(XENFIRMWAREDIR)/vtpm-stubdom.gz"
 
-install-vtpmmgr: vtpm-stubdom
+install-vtpmmgr: vtpmmgrdom
        $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
        $(INSTALL_PROG) mini-os-$(XEN_TARGET_ARCH)-vtpmmgr/mini-os.gz 
"$(DESTDIR)$(XENFIRMWAREDIR)/vtpmmgrdom.gz"
 



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