From: Joseph C. <jos...@in...> - 2010-01-06 08:46:25
|
changeset 75e242a56344 in /var/www/tboot.hg details: tboot.hg?cmd=changeset;node=75e242a56344 description: Removed trousers sub-project The trousers sub-project used an old version of TrouSerS and was problematic to build on many systems. Since most distributions now have trousers and trousers-devel packages either installed or optionally available, it is better just to require that as a dependency. Signed-off-by: Joseph Cihula <jos...@in...> diffstat: Makefile | 3 +- README | 12 +++++- lcptools/Makefile | 2 +- trousers/Makefile | 62 ------------------------------- 4 files changed, 13 insertions(+), 66 deletions(-) diffs (121 lines): diff -r 4b2f69457230 -r 75e242a56344 Makefile --- a/Makefile Tue Jan 05 10:27:47 2010 -0800 +++ b/Makefile Tue Jan 05 23:05:07 2010 -0800 @@ -9,8 +9,7 @@ include Config.mk # (txt-test is not included because it requires pathing to Linux src) -# (trousers is a dep of lcptools) -SUBDIRS := tboot trousers lcptools tb_polgen +SUBDIRS := tboot lcptools tb_polgen # # build rules diff -r 4b2f69457230 -r 75e242a56344 README --- a/README Tue Jan 05 10:27:47 2010 -0800 +++ b/README Tue Jan 05 23:05:07 2010 -0800 @@ -1,6 +1,5 @@ ****************************************************************************** * This version of tboot will not work with Xen versions <3.4 (c/s < 19115) * -* or the below-referenced Linux patches * ****************************************************************************** Trusted Boot (tboot) is an open source, pre-kernel/VMM module that uses @@ -57,8 +56,18 @@ provisioned into TPM NV using the lcptools. +Instructions for Building: +------------------------- +o The trousers sub-project has been removed (it was using an out-of-date + version and was often problematic to build). Instead, the trosuers and + trousers-devel packages must already be installed in order to build the + lcptools sub-project. Most distrubtions either provide these packages + by default or optionally; otherwise they can be found on various package + sites and manually installed. + + Instructions for Use: ---------------------- +-------------------- o The new tboot module must be added as the 'kernel' in the grub.conf file. The existing 'kernel' entry should follow as a 'module'. The SINIT AC module must be added to the grub.conf boot config as the last module, e.g.: diff -r 4b2f69457230 -r 75e242a56344 lcptools/Makefile --- a/lcptools/Makefile Tue Jan 05 10:27:47 2010 -0800 +++ b/lcptools/Makefile Tue Jan 05 23:05:07 2010 -0800 @@ -31,7 +31,7 @@ # universal rules # -build : $(TPMNV_TARGETS) $(LCP_TARGETS) +build : -ltspi $(TPMNV_TARGETS) $(LCP_TARGETS) dist : install diff -r 4b2f69457230 -r 75e242a56344 trousers/Makefile --- a/trousers/Makefile Tue Jan 05 10:27:47 2010 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -# -# trousers makefile -# - -ROOTDIR ?= $(CURDIR)/.. - -include $(ROOTDIR)/Config.mk - -TARGET = $(TARGET_DIR)/src/tcsd/tcsd -TARGET_DIR = trousers -TARGET_TARFILE = trousers-0.3.1.tar.gz - -TROUSERS_BASE_URL = http://downloads.sourceforge.net/trousers - -# -# universal rules -# - -build : $(TARGET) - - -dist : install - - -install : build - - -clean : - rm -f *~ - if [ -d $(TARGET_DIR) ]; then \ - $(MAKE) -C $(TARGET_DIR) clean; \ - rm -f $(TARGET); \ - fi - - -mrproper : clean - rm -rf $(TARGET_DIR) - - -distclean : clean - - -# -# dependencies -# - -$(TARGET) : $(TARGET_DIR)/Makefile - $(MAKE) -C $(TARGET_DIR) install - -$(TARGET_DIR)/Makefile : $(TARGET_DIR)/configure - cd $(TARGET_DIR) && ./configure --prefix=/usr - -$(TARGET_DIR)/configure : $(TARGET_DIR)/bootstrap.h - cd $(TARGET_DIR) && sh bootstrap.sh - -$(TARGET_DIR)/bootstrap.h : $(TARGET_TARFILE) - mkdir -p trousers - tar -xzf $(TARGET_TARFILE) -C $(TARGET_DIR)/ --strip-components 1 - touch $@ - -$(TARGET_TARFILE) : - wget $(TROUSERS_BASE_URL)/$(TARGET_TARFILE) |