From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Fioravante Subject: [PATCH special] vtpm fix cmake dependency Date: Thu, 13 Dec 2012 10:22:50 -0500 Message-ID: <50C9F2CA.1010602@jhuapl.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3177938388012268390==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: "xen-devel@lists.xen.org" , Ian Campbell List-Id: xen-devel@lists.xenproject.org This is a cryptographically signed message in MIME format. --===============3177938388012268390== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms080402000506050101070506" This is a cryptographically signed message in MIME format. --------------ms080402000506050101070506 Content-Type: multipart/mixed; boundary="------------030206080003050708020500" This is a multi-part message in MIME format. --------------030206080003050708020500 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Ian, this one is special just for you. I'm sending it as an attachment=20 because my email client will mangle it. This patch will remove the cmake dependency from xen prior to autoconf=20 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 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=20 stubdom/Makefile and accept all of the updates from the autoconf patch.=20 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. --------------030206080003050708020500 Content-Type: text/x-patch; name="0004-Remove-vtpm-from-default-build-targets.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0004-Remove-vtpm-from-default-build-targets.patch" =46rom 6feee4bb2be06b0853558e51d4384df2c4df1b68 Mon Sep 17 00:00:00 2001 From: Matthew Fioravante Date: Thu, 13 Dec 2012 10:10:54 -0500 Subject: [PATCH 4/9] Remove vtpm from default build targets Signed-off-by: Matthew Fioravante --- 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 +=3D -I$(XEN_ROOT)/xen/include =20 TARGET_LDFLAGS +=3D -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-e= lf/lib =20 -TARGETS=3Dioemu c caml grub xenstore vtpm vtpmmgr +TARGETS=3Dioemu c caml grub xenstore=20 =20 .PHONY: all all: build ifeq ($(STUBDOM_SUPPORTED),1) -build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom vtpm-stu= bdom vtpmmgrdom +build: genpath ioemu-stubdom c-stubdom pv-grub xenstore-stubdom=20 else build: genpath endif @@ -483,7 +483,7 @@ xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore= libxc xenstore ######### =20 ifeq ($(STUBDOM_SUPPORTED),1) -install: genpath install-readme install-ioemu install-grub install-xenst= ore install-vtpm install-vtpmmgr +install: genpath install-readme install-ioemu install-grub install-xenst= ore=20 else install: genpath endif --=20 1.7.10.4 --------------030206080003050708020500-- --------------ms080402000506050101070506 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIDyjCC A8YwggMvoAMCAQICBD/xyf0wDQYJKoZIhvcNAQEFBQAwLzELMAkGA1UEBhMCVVMxDzANBgNV BAoTBkpIVUFQTDEPMA0GA1UECxMGQklTRENBMB4XDTEwMDYxMTE4MjIwNloXDTEzMDYxMTE4 NTIwNlowZjELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkpIVUFQTDEPMA0GA1UECxMGUGVvcGxl MTUwFgYDVQQLEw9WUE5Hcm91cC1CSVNEQ0EwGwYDVQQDExRNYXR0aGV3IEUgRmlvcmF2YW50 ZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAnpbwVSP6o1Nb5lcW7dd3yTo9iBJdi7qz 4nANOMFPK7JOy5npKN1iiousl28U/scUJES55gPwAWYJK3uVyQAsA4adgDKi5DoD1UHDQEwp bY7iHLJeq0NPr4BqYNqnCFPbE6HC8zSJrr4qKn+gVUQT39SIFqdiIPJwZL8FYTRQ/zsCAwEA AaOCAbYwggGyMAsGA1UdDwQEAwIHgDArBgNVHRAEJDAigA8yMDEwMDYxMTE4MjIwNlqBDzIw MTIwNzE3MjI1MjA2WjAbBg0rBgEEAbMlCwMBAQEBBAoWCGZpb3JhbWUxMBsGDSsGAQQBsyUL AwEBAQIEChIIMDAxMDQyNjEwWAYJYIZIAYb6ax4BBEsMSVRoZSBwcml2YXRlIGtleSBjb3Jy ZXNwb25kaW5nIHRvIHRoaXMgY2VydGlmaWNhdGUgbWF5IGhhdmUgYmVlbiBleHBvcnRlZC4w KAYDVR0RBCEwH4EdTWF0dGhldy5GaW9yYXZhbnRlQGpodWFwbC5lZHUwUgYDVR0fBEswSTBH oEWgQ6RBMD8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJU0RD QTEOMAwGA1UEAxMFQ1JMNTYwHwYDVR0jBBgwFoAUCDUpmxH52EU2CyWmF2EJMB1yqeswHQYD VR0OBBYEFO6LYxg6r9wHZ+zdQtBHn1dZ/YTNMAkGA1UdEwQCMAAwGQYJKoZIhvZ9B0EABAww ChsEVjcuMQMCBLAwDQYJKoZIhvcNAQEFBQADgYEAJO9HQh4YNChVLzuZqK5ARJARD8JoujGZ fdo75quvg2jXFQe2sEjvLnxJZgm/pv8fdZakq48CWwjYHKuvIp7sDjTEsQfo+y7SpN/N2NvJ WU5SqfK1VgYtNLRRoGJUB5Q1aZ+Dg95g3kqpyfpUMISJL8IKVLtJVfN4fggFVUYZ9wwxggGr MIIBpwIBATA3MC8xCzAJBgNVBAYTAlVTMQ8wDQYDVQQKEwZKSFVBUEwxDzANBgNVBAsTBkJJ U0RDQQIEP/HJ/TAJBgUrDgMCGgUAoIHLMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJ KoZIhvcNAQkFMQ8XDTEyMTIxMzE1MjI1MFowIwYJKoZIhvcNAQkEMRYEFLvJGn+aej55Ff8M OiQulXZ5/1VhMGwGCSqGSIb3DQEJDzFfMF0wCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwDQYJKoZIhvcNAQEBBQAEgYB/pE5ggRMEQPNGhikKj5yR5XWaRKrFEFMG aocgQtje5Cld77zt7hC7G/BeL6p31taeXrjFgAbO6mQ96apYNcbVBq4DffQkQ3NdxDYuby1v pGqq6b0A8DX2mX2oHqHS8U+fD9sJr0XtlDL9fOEbtoWYizMsgj+jU/M8kOnDJRUXywAAAAAA AA== --------------ms080402000506050101070506-- --===============3177938388012268390== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============3177938388012268390==--