Merge branch '1.x'
Conflicts:
INSTALL
configure.ac
Conflicts required fixups to remove references to pthreads (an old
dependency).
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..61d17ea
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,65 @@
+To build and install the tpm2.0-tss software the following dependencies are
+required:
+GNU Autoconf
+GNU Autoconf archive
+GNU Automake
+GNU Libtool
+C compiler
+C++ compiler
+C Library Development Libraries and Header Files
+cmocka unit test framework
+pkg-config
+
+Currently the tpm2.0-tss is only distributed via GitHub as we have not yet
+produced an official source release. To obtain the tpm2.0-tss sources you
+must clone them from the 01.org GitHub organization TPM2.0-TSS git repository:
+git clone https://github.com/01org/TPM2.0-TSS
+
+To configure the tpm2.0-tss source code first define the environment for your
+build using a config.site file. The default for the project is kept at
+./lib/default_config.site. Pass this environment to the build through the
+CONFIG_SITE variable:
+$ ./bootstrap
+$ CONFIG_SITE=$(pwd)/lib/default_config.site ./configure
+
+You may also customize the config.site to your needs (please read the GNU
+documentation for config.site files) or use your platform / distro default
+by leaving the CONFIG_SITE environment variable undefined.
+
+Then compile the code:
+$ make
+
+Once you've built the tpm2.0-tss software it can be installed with:
+$ sudo make install
+
+This will install the libraries and the resource manager to locations
+determined at configure time. See the output of ./configure --help for the
+available options. Typically you won't need to do much more than provide an
+alternative --prefix option at configure time, and maybe DESTDIR at install
+time if you're packaging for a distro.
+
+We now have basic VPATH support which allows us to separate the source
+directory from the build directory. This allows for a developer to do a debug
+build and a regular build from the same sources. Any changes to the source
+will be buildable from both build directories. Before you attempt this be sure
+that the source directory is clean.
+
+Our example requires 3 directories:
+TPM2.0-TSS where the sources reside,
+tpm2tss-default to hold the build with default configuration
+tpm2tss-debug to hold a build with debug configuration
+
+In the TPM2.0-TSS directory bootstrap the build:
+$ ./bootstrap
+
+From the tpm2tss-default directory build the TPM2.0-TSS source code with the
+project's default configuration:
+$ CONFIG_SITE=$(pwd)/../TPM2.0-TSS/lib/default_config.site \
+ ../TPM2.0-TSS/configure
+$ make
+
+From the tpm2tss-debug directory build the TPM2.0-TSS source code with
+optimization disabled and debug symbols:
+$ CONFIG_SITE=$(pwd)/../TPM2.0-TSS/lib/debug_config.site \
+ ../TPM2.0-TSS/configure
+$ make
diff --git a/INSTALL.md b/INSTALL.md
index 88821ee..74fb815 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -8,7 +8,7 @@
* GNU Automake
* GNU Libtool
* C compiler
-* C Library Development Libraries and Header Files (for pthreads headers)
+* C Library Development Libraries and Header Files
* pkg-config
The following are dependencies only required when building the test suite.
diff --git a/configure.ac b/configure.ac
index 17be757..a595f8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,6 @@
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
LT_INIT()
-AC_C_BIGENDIAN
-AX_PTHREAD([], [AC_MSG_ERROR([requires pthread])])
AM_INIT_AUTOMAKE([foreign
subdir-objects])
AC_CONFIG_FILES([Makefile])
diff --git a/contrib/resourcemgr.service b/contrib/resourcemgr.service
deleted file mode 100644
index 7f23739..0000000
--- a/contrib/resourcemgr.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=TPM2 resource manager & access broker
-Documentation=http://www.github.com/01org/TPM2.0-TSS
-
-[Service]
-ExecStart=/usr/local/sbin/resourcemgr
-StandardOutput=null
-User=tss
-Group=tss
-
-[Install]
-WantedBy=multi-user.target
diff --git a/contrib/tpm-udev.rules b/contrib/tpm-udev.rules
deleted file mode 100644
index 448ec09..0000000
--- a/contrib/tpm-udev.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="tpm[0-9]*", MODE="0600", OWNER="tss", GROUP="tss"