Skip to content

Commit

Permalink
encoding: remove tools support as promised
Browse files Browse the repository at this point in the history
Closes tpm2-software#557

Signed-off-by: Erik Larsson <[email protected]>
  • Loading branch information
whooo committed Oct 1, 2024
1 parent 24214c0 commit f09cbaa
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 1,834 deletions.
20 changes: 0 additions & 20 deletions .ci/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set -exo pipefail

export TPM2_TSS_VERSION=${TPM2_TSS_VERSION:-"3.0.3"}
export TPM2_TSS_FAPI=${TPM2_TSS_FAPI:-"true"}
export TPM2_TOOLS_VERSION=${TPM2_TOOLS_VERSION:-"5.5"}

#
# Get dependencies for building and install tpm2-tss and abrmd projects
Expand Down Expand Up @@ -107,25 +106,6 @@ else
rm -fr /tmp/ibmswtpm2
fi

#
# Install tpm2-tools
#
if ! command -v tpm2 && [ -n "${TPM2_TOOLS_VERSION}" ]; then
# for git describe to work, one needs either a tag or a deep clone of master.
if [ "${TPM2_TOOLS_VERSION}" != "master" ]; then
tpm2_tools_extra_git_flags="--depth 1"
fi
git -C /tmp clone ${tpm2_tools_extra_git_flags} \
--branch "${TPM2_TOOLS_VERSION}" https://github.com/tpm2-software/tpm2-tools.git
pushd /tmp/tpm2-tools
./bootstrap
./configure CFLAGS=-g --disable-fapi
make -j$(nproc)
sudo make install
popd
fi


#
# Pip version 21.3 was broken with in-pace (-e) installs. Thus use something
# after it as it was fixed in 21.3.1
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
tss-version: ['master', '2.4.0', '3.0.0', '3.0.3', '3.2.0', '4.0.0']
with-fapi: [true]
tools-version: ['5.5']
include:
- python-version: '3.9'
tss-version: '3.1.0'
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ install_requires =
asn1crypto
cryptography>=43.0.0
packaging
pyyaml


[options.extras_require]
Expand Down
Loading

0 comments on commit f09cbaa

Please sign in to comment.