[PATCH special] vtpm fix cmake dependency

* [PATCH special] vtpm fix cmake dependency
@ 2012-12-13 15:22 Matthew Fioravante
  2012-12-18 11:31 ` Ian Campbell
  0 siblings, 1 reply; 6+ messages in thread
From: Matthew Fioravante @ 2012-12-13 15:22 UTC (permalink / raw)
  To: xen-devel, Ian Campbell


[-- Attachment #1.1.1: Type: text/plain, Size: 928 bytes --]

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

This patch applies ontop of [VTPM v7 3/8] vtpm/vtpmmgr and required libs 
to stubdom/Makefile

You can apply it to your tree by doing the following:

git rebase -i <VTPM v7 3/8 revision>

Select to EDIT the 3/8 revision

patch -p1 < 0004-Remove-vtpm-from-default-build-targets.patch

git commit --amend

git rebase --continue

You will hit conflicts with the autoconf patch, just edit 
stubdom/Makefile and accept all of the updates from the autoconf patch. 
Namely changing the TARGETS variable, build rule, and install rule

git add stubdom/Makefile
git commit
git rebase --continue


If you'd prefer not to go through these gyrations, I can send an updated 
full vtpm patchset with the fix merged in.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 0004-Remove-vtpm-from-default-build-targets.patch --]
[-- Type: text/x-patch; name="0004-Remove-vtpm-from-default-build-targets.patch", Size: 1382 bytes --]

From 6feee4bb2be06b0853558e51d4384df2c4df1b68 Mon Sep 17 00:00:00 2001
From: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Date: Thu, 13 Dec 2012 10:10:54 -0500
Subject: [PATCH 4/9] Remove vtpm from default build targets

Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
---
 stubdom/Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stubdom/Makefile b/stubdom/Makefile
index fc70d88..357ee70 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -86,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 vtpm vtpmmgr
+TARGETS=ioemu c caml grub xenstore 
 
 .PHONY: all
 all: build
 ifeq ($(STUBDOM_SUPPORTED),1)
-build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom vtpm-stubdom vtpmmgrdom
+build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom 
 else
 build: genpath
 endif
@@ -483,7 +483,7 @@ xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore
 #########
 
 ifeq ($(STUBDOM_SUPPORTED),1)
-install: genpath install-readme install-ioemu install-grub install-xenstore install-vtpm install-vtpmmgr
+install: genpath install-readme install-ioemu install-grub install-xenstore 
 else
 install: genpath
 endif
-- 
1.7.10.4


[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 1459 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread