Update README file for Xen 3.2, and add tboot makefile targets and

readme decsription.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/Makefile b/Makefile
index 6559da4fde801c72495b65c1cfaf8852a4a0f160..4e79a448141704613bef3cd4d596d06fbefe3217 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ world:
 
 # clean doesn't do a kclean
 .PHONY: clean
-clean:: 
+clean::
        $(MAKE) -C xen clean
        $(MAKE) -C tools clean
        $(MAKE) -C docs clean
@@ -154,6 +154,11 @@ help:
        @echo '  uninstall        - attempt to remove installed Xen tools'
        @echo '                     (use with extreme care!)'
        @echo
+       @echo 'Trusted Boot (tboot) targets:'
+       @echo '  build-tboot      - download and build the tboot module'
+       @echo '  install-tboot    - download, build, and install the tboot module'
+       @echo '  clean-tboot      - clean the tboot module if it exists'
+       @echo
        @echo 'Environment:'
        @echo '  XEN_PYTHON_NATIVE_INSTALL=y'
        @echo '                   - native python install or dist'
@@ -194,8 +199,43 @@ uninstall:
        rm -rf $(D)/usr/share/xen
        rm -rf $(D)/usr/share/man/man1/xen*
        rm -rf $(D)/usr/share/man/man8/xen*
+       rm -rf $(D)/boot/tboot*
 
 # Legacy targets for compatibility
 .PHONY: linux26
 linux26:
        $(MAKE) 'KERNELS=linux-2.6*' kernels
+
+
+#
+# tboot targets
+#
+
+TBOOT_TARFILE = tboot-20071029.tar.gz
+TBOOT_BASE_URL = http://downloads.sourceforge.net/tboot
+
+.PHONY: build-tboot
+build-tboot: download_tboot
+       $(MAKE) -C tboot build
+
+.PHONY: install-tboot
+install-tboot: download_tboot
+       $(MAKE) -C tboot install
+
+.PHONY: clean-tboot
+clean-tboot:
+       [ ! -d tboot ] || $(MAKE) -C tboot clean
+
+.PHONY: distclean-tboot
+distclean-tboot:
+       [ ! -d tboot ] || $(MAKE) -C tboot distclean
+
+.PHONY: download_tboot
+download_tboot: tboot/Makefile
+
+tboot/Makefile: tboot/$(TBOOT_TARFILE)
+       [ -e tboot/Makefile ] || tar -xzf tboot/$(TBOOT_TARFILE) -C tboot/ --strip-components 1
+
+tboot/$(TBOOT_TARFILE):
+       mkdir -p tboot
+       wget -O tboot/$(TBOOT_TARFILE) $(TBOOT_BASE_URL)/$(TBOOT_TARFILE)

diff --git a/README b/README
index 5f0a20417e952c2d409a6e34f8ea27dfb73728b1..1946c0a53954b27b71b720e44dded82a7418ef32 100644 (file)
--- a/README
+++ b/README
@@ -1,13 +1,13 @@
-#############################
- __  __            _____  _ 
- \ \/ /___ _ __   |___ / / |
-  \  // _ \ '_ \    |_ \ | |
-  /  \  __/ | | |  ___) || |
- /_/\_\___|_| |_| |____(_)_|
+#################################
+ __  __            _____  ____  
+ \ \/ /___ _ __   |___ / |___ \ 
+  \  // _ \ '_ \    |_ \   __) |
+  /  \  __/ | | |  ___) | / __/ 
+ /_/\_\___|_| |_| |____(_)_____|
+                                
+#################################
 
-#############################
-
-http://www.xensource.com/xen/about.html
+http://www.xen.org/
 
 What is Xen?
 ============
@@ -21,7 +21,7 @@ development community, spearheaded by XenSource Inc, a company created
 by the original Xen development team to build enterprise products
 around Xen.
 
-The 3.1 release offers excellent performance, hardware support and
+The 3.2 release offers excellent performance, hardware support and
 enterprise-grade features such as x86_32-PAE, x86_64, SMP guests and
 live relocation of VMs. This install tree contains source for a Linux
 2.6 guest; ports to Linux 2.4, NetBSD, FreeBSD and Solaris are
@@ -55,8 +55,8 @@ performed with root privileges.]
    /boot/grub/menu.lst: edit this file to include an entry like the
    following:
 
-    title Xen 3.1 / XenLinux 2.6
-       kernel /boot/xen-3.1.gz console=vga
+    title Xen 3.2 / XenLinux 2.6
+       kernel /boot/xen-3.2.gz console=vga
        module /boot/vmlinuz-2.6-xen root=<root-dev> ro console=tty0
        module /boot/initrd-2.6-xen.img
 
@@ -75,7 +75,7 @@ performed with root privileges.]
    32MB memory for internal use, which is not available for allocation
    to virtual machines.
 
-3. Reboot your system and select the "Xen 3.1 / XenLinux 2.6" menu
+3. Reboot your system and select the "Xen 3.2 / XenLinux 2.6" menu
    option. After booting Xen, Linux will start and your initialisation
    scripts should execute in the usual way.
 
@@ -202,3 +202,29 @@ Xend (the Xen daemon) has the following runtime dependencies:
     * For optional XenAPI support in XM, PyXML:
           URL:    http://pyxml.sourceforge.net
           YUM:    PyXML
+
+
+Intel(R) Trusted Execution Technology Support
+=============================================
+
+Intel's technology for safer computing, Intel(R) Trusted Execution Technology
+(Intel(R) TXT), defines platform-level enhancements that provide the building
+blocks for creating trusted platforms.  For more information, see
+http://www.intel.com/technology/security/.
+
+Intel(R) TXT support is provided by the Trusted Boot (tboot) module in
+conjunction with minimal logic in the Xen hypervisor.
+
+Tboot is an open source, pre- kernel/VMM module that uses Intel(R) TXT to
+perform a measured and verified launch of an OS kernel/VMM.
+
+The Trusted Boot module is available from
+http://sourceforge.net/projects/tboot.  This project hosts the code in a
+mercurial repo at http://tboot.sourceforge.net/hg/tboot.hg and contains
+tarballs of the source.  Instructions in the tboot README describe how
+to modify grub.conf to use tboot to launch Xen.
+
+There are optional targets as part of Xen's top-level makefile that will
+downlaod and build tboot: install-tboot, build-tboot, dist-tboot, clean-tboot.
+These will download the latest tar file from the SourceForge site using wget,
+then build/install/dist according to Xen's settings.