Update to the latest TBOOT/SINITs, make trousers/tpmtools generic packages.

diff --git a/package/Config.in b/package/Config.in
index 5d45e7b0b723e41076cb338495db39fbc20ab37b..fd76d5bf53c363631424e4cf3e115644c141f0c2 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -114,6 +114,10 @@ source "package/sysklogd/Config.in"
 # busybox has init and the runit stuff
 source "package/sysvinit/Config.in"
 source "package/tinylogin/Config.in"
+endif
+source "package/tpm-tools/Config.in"
+source "package/trousers/Config.in"
+if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/util-linux/Config.in"
 source "package/util-linux-ng/Config.in"
 source "package/which/Config.in"

diff --git a/package/tpm-tools/Config.in b/package/tpm-tools/Config.in
new file mode 100644 (file)
index 0000000..a96ff9b
--- /dev/null
+++ b/package/tpm-tools/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_TPM_TOOLS
+       bool "tpm-tools"
+       default n
+       depends on BR2_PACKAGE_TROUSERS 
+       help
+               TCG TPM configuration tools.

diff --git a/package/tpm-tools/tpm-tools.mk b/package/tpm-tools/tpm-tools.mk
new file mode 100644 (file)
index 0000000..1d63355
--- /dev/null
+++ b/package/tpm-tools/tpm-tools.mk
@@ -0,0 +1,24 @@
+#############################################################
+#
+# tpm-tools
+#
+#############################################################
+
+TPM_TOOLS_SITE:=http://downloads.sourceforge.net/trousers
+TPM_TOOLS_VERSION:=1.3.4
+TPM_TOOLS_SOURCE:=tpm-tools-$(TPM_TOOLS_VERSION).tar.gz
+TPM_TOOLS_DIR:=$(BUILD_DIR)/tpm-tools-$(TPM_TOOLS_VERSION)
+
+TPM_TOOLS_INSTALL_STAGING = NO
+TPM_TOOLS_INSTALL_TARGET = YES
+TPM_TOOLS_DEPENDENCIES = trousers
+TPM_TOOLS_AUTORECONF = YES
+TPM_TOOLS_LIBTOOL_PATCH = NO
+TPM_TOOLS_CONF_OPT = --disable-nls --with-included-gettext
+
+$(eval $(call AUTOTARGETS,package,tpm-tools))
+
+$(TPM_TOOLS_TARGET_EXTRACT):
+       $(ZCAT) $(DL_DIR)/$(TPM_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       touch $(TPM_TOOLS_DIR)/.unpacked
+               
\ No newline at end of file

diff --git a/package/trousers/Config.in b/package/trousers/Config.in
new file mode 100644 (file)
index 0000000..aa4f8f8
--- /dev/null
+++ b/package/trousers/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_TROUSERS
+       bool "trousers"
+       default n
+       help
+               TCG TPM Software Stack (TSS) daemon.

diff --git a/package/trousers/trousers-no-groups-users.patch b/package/trousers/trousers-no-groups-users.patch
new file mode 100644 (file)
index 0000000..a8d26d4
--- /dev/null
+++ b/package/trousers/trousers-no-groups-users.patch
@@ -0,0 +1,47 @@
+diff -Nur a/dist/Makefile.am b/dist/Makefile.am
+--- a/dist/Makefile.am 2009-08-06 09:17:20.000000000 -0400
++++ b/dist/Makefile.am 2010-01-07 03:58:40.059000000 -0500
+@@ -1,17 +1,11 @@
+ 
+ install: install-exec-hook
+       if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi
+-      /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf
+       /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
+ 
+ install-exec-hook:
+-      /usr/sbin/groupadd tss || true
+-      /usr/sbin/useradd -r tss -g tss || true
+-      /bin/chown tss:tss ${DESTDIR}/@sbindir@/tcsd
+-      /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
+-      /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm
++      /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'        
+       /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm
+ 
+ uninstall-hook:
+-      /usr/sbin/userdel tss
+-      /usr/sbin/groupdel tss
++      
+diff -Nur a/dist/Makefile.in b/dist/Makefile.in
+--- a/dist/Makefile.in 2009-08-04 13:49:06.000000000 -0400
++++ b/dist/Makefile.in 2010-01-07 03:59:36.407000000 -0500
+@@ -435,20 +435,13 @@
+ 
+ install: install-exec-hook
+       if test ! -e ${DESTDIR}/@sysconfdir@/tcsd.conf; then mkdir -p ${DESTDIR}/@sysconfdir@ && cp tcsd.conf ${DESTDIR}/@sysconfdir@; fi
+-      /bin/chown tss:tss ${DESTDIR}/@sysconfdir@/tcsd.conf
+       /bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
+ 
+ install-exec-hook:
+-      /usr/sbin/groupadd tss || true
+-      /usr/sbin/useradd -r tss -g tss || true
+-      /bin/chown tss:tss ${DESTDIR}/@sbindir@/tcsd
+       /bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
+-      /bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm
+       /bin/chmod 0700 ${DESTDIR}/@localstatedir@/lib/tpm
+ 
+ uninstall-hook:
+-      /usr/sbin/userdel tss
+-      /usr/sbin/groupdel tss
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

diff --git a/package/trousers/trousers.mk b/package/trousers/trousers.mk
new file mode 100644 (file)
index 0000000..f93dd93
--- /dev/null
+++ b/package/trousers/trousers.mk
@@ -0,0 +1,22 @@
+#############################################################
+#
+# trousers
+#
+#############################################################
+
+TROUSERS_SITE:=http://downloads.sourceforge.net/trousers
+TROUSERS_VERSION:=0.3.2-1
+TROUSERS_SOURCE:=trousers-$(TROUSERS_VERSION).tar.gz
+TROUSERS_DIR:=$(BUILD_DIR)/trousers-$(TROUSERS_VERSION)
+
+TROUSERS_INSTALL_STAGING = YES
+TROUSERS_INSTALL_TARGET = YES
+TROUSERS_DEPENDENCIES = openssl
+TROUSERS_AUTORECONF = YES
+TROUSERS_LIBTOOL_PATCH = NO
+
+$(eval $(call AUTOTARGETS,package,trousers))
+
+$(TROUSERS_TARGET_EXTRACT):
+       $(ZCAT) $(DL_DIR)/$(TROUSERS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       touch $(TROUSERS_DIR)/.unpacked 
\ No newline at end of file

diff --git a/package/xenclient/acm/Config.in b/package/xenclient/acm/Config.in
index 8646681fc21240d94edcb59162f634a75f4106fd..32c2ac0e003bd6c283621c4b62f239d96008e379 100644 (file)
--- a/package/xenclient/acm/Config.in
+++ b/package/xenclient/acm/Config.in
@@ -1,9 +1,9 @@
 choice
-       prompt "ACM SINIT Module"
+       prompt "TXT ACM Module"
        default BR2_ACM_GM45_PM45
        depends on BR2_PACKAGE_XENCLIENT_TBOOT
        help
-         Select the ACM SINIT module for the target chipset.
+         Select the TXT ACM SINIT module for the target chipset.
 
 config BR2_ACM_GM45_PM45
        bool "GM45 and PM45 chipsets"
@@ -11,6 +11,4 @@ config BR2_ACM_Q45_Q43
        bool "Q45 and Q43 chipsets"
 config BR2_ACM_Q35
        bool "Q35 chipset"
-config BR2_ACM_X38
-       bool "X38 chipset"
 endchoice

diff --git a/package/xenclient/acm/acm.mk b/package/xenclient/acm/acm.mk
index 50a73508894bcafb5f30fd9af85a92696fa5afcf..37fe44584085126238948bc8e83009069c8d3df9 100644 (file)
--- a/package/xenclient/acm/acm.mk
+++ b/package/xenclient/acm/acm.mk
@@ -4,20 +4,16 @@
 #
 #############################################################
 ifeq ($(BR2_ACM_GM45_PM45),y)
-XENCLIENT_ACM_PACKAGE:=GM45_PM45-SINIT.tar.gz
-XENCLIENT_ACM_MODULE:=GM45_PM45_SINIT_19.BIN
+XENCLIENT_ACM_PACKAGE:=GM45_GS45_PM45-SINIT.tar.gz
+XENCLIENT_ACM_MODULE:=GM45_GS45_PM45_SINIT_21.BIN
 endif
 ifeq ($(BR2_ACM_Q45_Q43),y)
 XENCLIENT_ACM_PACKAGE:=Q45_Q43-SINIT.tar.gz
-XENCLIENT_ACM_MODULE:=Q45_Q43_SINIT_17.BIN
+XENCLIENT_ACM_MODULE:=Q45_Q43_SINIT_18.BIN
 endif
 ifeq ($(BR2_ACM_Q35),y)
-XENCLIENT_ACM_PACKAGE:=Q35_X38-SINIT.tar.gz
-XENCLIENT_ACM_MODULE:=Q35_SINIT_17.BIN
-endif
-ifeq ($(BR2_ACM_X38),y)
-XENCLIENT_ACM_PACKAGE:=Q35_X38-SINIT.tar.gz
-XENCLIENT_ACM_MODULE:=X38_SINIT_17.BIN
+XENCLIENT_ACM_PACKAGE:=Q35-SINIT.tar.gz
+XENCLIENT_ACM_MODULE:=Q35_SINIT_18.BIN
 endif
 
 XENCLIENT_ACM_SITE:=http://downloads.sourceforge.net/tboot
@@ -60,6 +56,4 @@ endif
 ifeq ($(BR2_ACM_Q35),y)
 TARGETS+=xenclient-acm
 endif
-ifeq ($(BR2_ACM_X38),y)
-TARGETS+=xenclient-acm
-endif
+

diff --git a/package/xenclient/tboot/Config.in b/package/xenclient/tboot/Config.in
index 5011617b6651e5ed2122443fa3295e9e955631a2..44c8717dfe3b912bb64b0a73712df8bfea6b45ab 100644 (file)
--- a/package/xenclient/tboot/Config.in
+++ b/package/xenclient/tboot/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_XENCLIENT_TBOOT
        bool "XenClient TBOOT"
        default n
+       depends on BR2_PACKAGE_TROUSERS && BR2_PACKAGE_TPM_TOOLS
        help
                XenClient TXT trusted boot support.
 
@@ -11,6 +12,4 @@ config BR2_PACKAGE_XENCLIENT_TBOOT_TOOLS
        help
                Tools for configuring the TPM for TBOOT use.
 
-source "package/xenclient/tboot/trousers/Config.in"
-source "package/xenclient/tboot/tpmtools/Config.in"
 

diff --git a/package/xenclient/tboot/tboot.mk b/package/xenclient/tboot/tboot.mk
index 7a14c962153f972414aa79222d47fa458109ef9d..e1f6ff16567a53ee21b67e36dff43c29c4baa2dc 100644 (file)
--- a/package/xenclient/tboot/tboot.mk
+++ b/package/xenclient/tboot/tboot.mk
@@ -3,11 +3,8 @@
 # tboot
 #
 #############################################################
-include package/xenclient/tboot/trousers/trousers.mk
-include package/xenclient/tboot/tpmtools/tpmtools.mk
-
 XENCLIENT_TBOOT_SITE:=http://xenbits.xen.org/xenclient/download
-XENCLIENT_TBOOT_VERSION:=cs144
+XENCLIENT_TBOOT_VERSION:=cs182
 XENCLIENT_TBOOT_SOURCE:=tboot-snapshot-$(XENCLIENT_TBOOT_VERSION).tar.gz
 XENCLIENT_TBOOT_REPO:=$(REPO_DIR)/tboot.hg
 XENCLIENT_TBOOT_DIR:=$(BUILD_DIR)/tboot-snapshot-$(XENCLIENT_TBOOT_VERSION)
@@ -47,7 +44,7 @@ $(TARGET_DIR)/$(XENCLIENT_TBOOT_TARGET_BINARY): $(XENCLIENT_TBOOT_DIR)/$(XENCLIE
                chmod 444 $(XENCLIENT_TBOOT_BOOT)/tboot.gz
        cp -f package/xenclient/tboot/lcp_data.bin $(XENCLIENT_TBOOT_BOOT)
 
-xenclient-tboot: xenclient-xen-auto xenclient-kernel-auto $(TARGET_DIR)/$(XENCLIENT_TBOOT_TARGET_BINARY)
+xenclient-tboot: xenclient-xen-auto xenclient-kernel-auto trousers tpm-tools $(TARGET_DIR)/$(XENCLIENT_TBOOT_TARGET_BINARY)
 
 xenclient-tboot-clean:
        -$(MAKE) -C $(XENCLIENT_TBOOT_DIR)/tboot clean
@@ -60,8 +57,8 @@ xenclient-tboot-dirclean:
 ### tboot-tools
 
 $(XENCLIENT_TBOOT_DIR)/$(XENCLIENT_TBOOT_TOOLS_BINARY): $(XENCLIENT_TBOOT_DIR)
-       $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS) -lz" -C $(XENCLIENT_TBOOT_DIR)/tb_polgen
-       $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS+="$(XENCLIENT_TBOOT_TOOLS_INC)" \
+       $(MAKE) $(TARGET_CONFIGURE_OPTS) libdir=$(STAGING_DIR)/usr/lib LDFLAGS="$(TARGET_LDFLAGS) -lz" -C $(XENCLIENT_TBOOT_DIR)/tb_polgen
+       $(MAKE) $(TARGET_CONFIGURE_OPTS) libdir=$(STAGING_DIR)/usr/lib CFLAGS+="$(XENCLIENT_TBOOT_TOOLS_INC)" \
                LDFLAGS="$(TARGET_LDFLAGS) -lz" -C $(XENCLIENT_TBOOT_DIR)/lcptools
 
 $(TARGET_DIR)/$(XENCLIENT_TBOOT_TOOLS_TARGET_BINARY): $(XENCLIENT_TBOOT_DIR)/$(XENCLIENT_TBOOT_TOOLS_BINARY)
@@ -73,7 +70,7 @@ $(TARGET_DIR)/$(XENCLIENT_TBOOT_TOOLS_TARGET_BINARY): $(XENCLIENT_TBOOT_DIR)/$(X
        done
        cp -f package/xenclient/tboot/configure_tboot $(TARGET_DIR)/usr/share/xenclient
 
-xenclient-tboot-tools: uclibc zlib xenclient-xen-auto xenclient-tboot xenclient-trousers $(TARGET_DIR)/$(XENCLIENT_TBOOT_TOOLS_TARGET_BINARY)
+xenclient-tboot-tools: uclibc zlib xenclient-xen-auto xenclient-tboot $(TARGET_DIR)/$(XENCLIENT_TBOOT_TOOLS_TARGET_BINARY)
 
 xenclient-tboot-tools-clean:
        -$(MAKE) -C $(XENCLIENT_TBOOT_DIR)/tb_polgen clean

diff --git a/package/xenclient/tboot/tpmtools/Config.in b/package/xenclient/tboot/tpmtools/Config.in
deleted file mode 100644 (file)
index d69df9f..0000000
--- a/package/xenclient/tboot/tpmtools/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_XENCLIENT_TPMTOOLS
-       bool "XenClient TPM tools"
-       default n
-       depends on BR2_PACKAGE_XENCLIENT_TBOOT
-       help
-               TPM configuration tools.

diff --git a/package/xenclient/tboot/tpmtools/tpmtools.mk b/package/xenclient/tboot/tpmtools/tpmtools.mk
deleted file mode 100644 (file)
index ca959e9..0000000
--- a/package/xenclient/tboot/tpmtools/tpmtools.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#############################################################
-#
-# trousers
-#
-#############################################################
-
-XENCLIENT_TBOOT_TPMTOOLS_SITE:=http://downloads.sourceforge.net/trousers
-XENCLIENT_TBOOT_TPMTOOLS_VERSION:=1.3.1
-XENCLIENT_TBOOT_TPMTOOLS_SOURCE:=tpm-tools-$(XENCLIENT_TBOOT_TPMTOOLS_VERSION).tar.gz
-XENCLIENT_TBOOT_TPMTOOLS_DIR:=$(BUILD_DIR)/tpm-tools-$(XENCLIENT_TBOOT_TPMTOOLS_VERSION)
-XENCLIENT_TBOOT_TPMTOOLS_INC:=-I$(STAGING_DIR)/usr/include
-XENCLIENT_TBOOT_TPMTOOLS_BINARY:=src/tpm_mgmt/tpm_takeownership
-XENCLIENT_TBOOT_TPMTOOLS_TARGET_BINARY:=usr/sbin/tpm_takeownership
-
-$(DL_DIR)/$(XENCLIENT_TBOOT_TPMTOOLS_SOURCE):
-       $(WGET) -P $(DL_DIR) $(XENCLIENT_TBOOT_TPMTOOLS_SITE)/$(XENCLIENT_TBOOT_TPMTOOLS_SOURCE)        
-       
-xenclient-tpmtools-unpacked: $(XENCLIENT_TBOOT_TPMTOOLS_DIR)/.unpacked
-$(XENCLIENT_TBOOT_TPMTOOLS_DIR)/.unpacked: $(DL_DIR)/$(XENCLIENT_TBOOT_TPMTOOLS_SOURCE)
-       $(ZCAT) $(DL_DIR)/$(XENCLIENT_TBOOT_TPMTOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       touch $(XENCLIENT_TBOOT_TPMTOOLS_DIR)/.unpacked 
-
-xenclient-tpmtools-source: $(DL_DIR)/$(XENCLIENT_TBOOT_TPMTOOLS_SOURCE)        
-
-$(XENCLIENT_TBOOT_TPMTOOLS_DIR)/.configured: $(XENCLIENT_TBOOT_TPMTOOLS_DIR)/.unpacked
-       (cd $(XENCLIENT_TBOOT_TPMTOOLS_DIR); rm -rf config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               $(TARGET_CONFIGURE_ARGS) \
-               CFLAGS+="$(XENCLIENT_TBOOT_TOOLS_INC)" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
-               ./configure \
-               --host=$(GNU_TARGET_NAME) \
-               --prefix=/usr \
-               --disable-nls \
-       )
-       touch $(XENCLIENT_TBOOT_TPMTOOLS_DIR)/.configured
-
-$(XENCLIENT_TBOOT_TPMTOOLS_DIR)/$(XENCLIENT_TBOOT_TPMTOOLS_BINARY): $(XENCLIENT_TBOOT_TPMTOOLS_DIR)/.configured
-       $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(XENCLIENT_TBOOT_TPMTOOLS_DIR)
-
-$(TARGET_DIR)/$(XENCLIENT_TBOOT_TPMTOOLS_TARGET_BINARY): $(XENCLIENT_TBOOT_TPMTOOLS_DIR)/$(XENCLIENT_TBOOT_TPMTOOLS_BINARY)
-       $(MAKE) -C $(XENCLIENT_TBOOT_TPMTOOLS_DIR) DESTDIR=$(TARGET_DIR) install
-       rm -rf $(TARGET_DIR)/usr/man
-       
-xenclient-tpmtools: uclibc xenclient-xen-auto xenclient-trousers $(TARGET_DIR)/$(XENCLIENT_TBOOT_TPMTOOLS_TARGET_BINARY)
-
-xenclient-tpmtools-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENCLIENT_TBOOT_TPMTOOLS_DIR) uninstall
-       -$(MAKE) -C $(XENCLIENT_TBOOT_TPMTOOLS_DIR) clean
-
-xenclient-tpmtools-dirclean:
-       rm -rf $(XENCLIENT_TBOOT_TPMTOOLS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_XENCLIENT_TPMTOOLS),y)
-TARGETS+=xenclient-tpmtools
-endif

diff --git a/package/xenclient/tboot/trousers/Config.in b/package/xenclient/tboot/trousers/Config.in
deleted file mode 100644 (file)
index 2e27904..0000000
--- a/package/xenclient/tboot/trousers/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_XENCLIENT_TROUSERS
-       bool "XenClient TROUSERS stack"
-       default n
-       depends on BR2_PACKAGE_XENCLIENT_TBOOT
-       help
-               TCG TPM Software Stack (TSS) daemon.

diff --git a/package/xenclient/tboot/trousers/trousers-limits.patch b/package/xenclient/tboot/trousers/trousers-limits.patch
deleted file mode 100644 (file)
index 55c3c6d..0000000
--- a/package/xenclient/tboot/trousers/trousers-limits.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trousers-0.3.1/src/include/trousers/trousers.h     2009-10-03 21:58:19.000000000 +0100
-+++ trousers-0.3.1/src/include/trousers/trousers.h     2009-10-03 21:58:43.000000000 +0100
-@@ -11,6 +11,8 @@
- #ifndef _TROUSERS_H_
- #define _TROUSERS_H_
- 
-+#include <limits.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif

diff --git a/package/xenclient/tboot/trousers/trousers-xenclient-build.patch b/package/xenclient/tboot/trousers/trousers-xenclient-build.patch
deleted file mode 100644 (file)
index cc3a890..0000000
--- a/package/xenclient/tboot/trousers/trousers-xenclient-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur a/Makefile.am b/Makefile.am
---- a/Makefile.am      2005-07-07 14:45:28.000000000 -0400
-+++ b/Makefile.am      2009-02-06 15:23:33.000000000 -0500
-@@ -1 +1 @@
--SUBDIRS = src man dist tools
-+SUBDIRS = src tools
-diff -Nur a/Makefile.in b/Makefile.in
---- a/Makefile.in      2007-11-02 17:59:48.000000000 -0400
-+++ b/Makefile.in      2009-02-06 16:15:28.000000000 -0500
-@@ -278,7 +278,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = src man dist tools
-+SUBDIRS = src tools
- all: all-recursive
- 
- .SUFFIXES:
-diff -Nur a/tools/ps_inspect.c b/tools/ps_inspect.c
---- a/tools/ps_inspect.c       2007-09-25 12:28:56.000000000 -0400
-+++ b/tools/ps_inspect.c       2009-02-06 15:24:39.000000000 -0500
-@@ -332,7 +332,7 @@
- 
-       file_size = stat_buf.st_size;
- 
--      PRINT("filename: %s (%ld bytes)\n", argv[1], file_size);
-+      PRINT("filename: %s (%ld bytes)\n", argv[1], (long int)file_size);
- 
-       rc = inspect(f, file_size);
- 

diff --git a/package/xenclient/tboot/trousers/trousers.mk b/package/xenclient/tboot/trousers/trousers.mk
deleted file mode 100644 (file)
index 8c1b60f..0000000
--- a/package/xenclient/tboot/trousers/trousers.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#############################################################
-#
-# trousers
-#
-#############################################################
-XENCLIENT_TBOOT_TROUSERS_SITE:=http://downloads.sourceforge.net/trousers
-XENCLIENT_TBOOT_TROUSERS_VERSION:=0.3.1
-XENCLIENT_TBOOT_TROUSERS_SOURCE:=trousers-$(XENCLIENT_TBOOT_TROUSERS_VERSION).tar.gz
-XENCLIENT_TBOOT_TROUSERS_DIR:=$(BUILD_DIR)/trousers-$(XENCLIENT_TBOOT_TROUSERS_VERSION)
-XENCLIENT_TBOOT_TROUSERS_BINARY:=src/tcsd/tcsd
-XENCLIENT_TBOOT_TROUSERS_TARGET_BINARY:=usr/sbin/tcsd
-
-$(DL_DIR)/$(XENCLIENT_TBOOT_TROUSERS_SOURCE):
-       $(WGET) -P $(DL_DIR) $(XENCLIENT_TBOOT_TROUSERS_SITE)/$(XENCLIENT_TBOOT_TROUSERS_SOURCE)        
-       
-xenclient-trousers-unpacked: $(XENCLIENT_TBOOT_TROUSERS_DIR)/.unpacked
-$(XENCLIENT_TBOOT_TROUSERS_DIR)/.unpacked: $(DL_DIR)/$(XENCLIENT_TBOOT_TROUSERS_SOURCE)
-       $(ZCAT) $(DL_DIR)/$(XENCLIENT_TBOOT_TROUSERS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       toolchain/patch-kernel.sh $(XENCLIENT_TBOOT_TROUSERS_DIR) package/xenclient/tboot/trousers trousers\*.patch
-       touch $(XENCLIENT_TBOOT_TROUSERS_DIR)/.unpacked 
-
-xenclient-trousers-source: $(DL_DIR)/$(XENCLIENT_TBOOT_TROUSERS_SOURCE)        
-
-$(XENCLIENT_TBOOT_TROUSERS_DIR)/.configured: $(XENCLIENT_TBOOT_TROUSERS_DIR)/.unpacked
-       (cd $(XENCLIENT_TBOOT_TROUSERS_DIR); rm -rf config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               $(TARGET_CONFIGURE_ARGS) \
-               ./configure \
-               --host=$(GNU_TARGET_NAME) \
-               --prefix=/usr \
-               --with-gui=none \
-       )
-       touch $(XENCLIENT_TBOOT_TROUSERS_DIR)/.configured
-
-$(XENCLIENT_TBOOT_TROUSERS_DIR)/$(XENCLIENT_TBOOT_TROUSERS_BINARY): $(XENCLIENT_TBOOT_TROUSERS_DIR)/.configured
-       $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(XENCLIENT_TBOOT_TROUSERS_DIR)
-
-$(TARGET_DIR)/$(XENCLIENT_TBOOT_TROUSERS_TARGET_BINARY): $(XENCLIENT_TBOOT_TROUSERS_DIR)/$(XENCLIENT_TBOOT_TROUSERS_BINARY)
-       $(MAKE) -C $(XENCLIENT_TBOOT_TROUSERS_DIR) DESTDIR=$(TARGET_DIR) install
-       $(MAKE) -C $(XENCLIENT_TBOOT_TROUSERS_DIR) DESTDIR=$(STAGING_DIR) install
-       rm -rf $(TARGET_DIR)/usr/man
-       
-xenclient-trousers: uclibc xenclient-xen-auto openssl $(TARGET_DIR)/$(XENCLIENT_TBOOT_TROUSERS_TARGET_BINARY)
-
-xenclient-trousers-clean:
-       $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENCLIENT_TBOOT_TROUSERS_DIR) uninstall
-       -$(MAKE) -C $(XENCLIENT_TBOOT_TROUSERS_DIR) clean
-
-xenclient-trousers-dirclean:
-       rm -rf $(XENCLIENT_TBOOT_TROUSERS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_XENCLIENT_TROUSERS),y)
-TARGETS+=xenclient-trousers
-endif