Skip to content

Commit 9aaeb74

Browse files
authored
Remove patch for IbmTpm (#2393)
### Description of changes: Now that we have upstreamed ibmswtpm2, remove the patches and update the build script. kgoldman/ibmswtpm2@4315354 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.
1 parent 4fc362f commit 9aaeb74

File tree

2 files changed

+0
-154
lines changed

2 files changed

+0
-154
lines changed

tests/ci/integration/ibmtpm_patch/ibmtpm-mainline-awslc.patch

-146
This file was deleted.

tests/ci/integration/run_ibmtpm_integration.sh

-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ source tests/ci/common_posix_setup.sh
1919
SCRATCH_FOLDER="${SRC_ROOT}/IBMTPM_BUILD_ROOT"
2020
IBMTPM_SRC_FOLDER="${SCRATCH_FOLDER}/ibmtpm"
2121
IBMTPM_BUILD_PREFIX="${IBMTPM_SRC_FOLDER}/build/install"
22-
IBMTPM_PATCH_BUILD_FOLDER="${SRC_ROOT}/tests/ci/integration/ibmtpm_patch"
2322

2423
AWS_LC_BUILD_FOLDER="${SCRATCH_FOLDER}/aws-lc-build"
2524
AWS_LC_INSTALL_FOLDER="${SCRATCH_FOLDER}/aws-lc-install"
@@ -44,12 +43,6 @@ function ibmtpm_build() {
4443
popd
4544
}
4645

47-
function ibmtpm_patch_build() {
48-
patchfile="${IBMTPM_PATCH_BUILD_FOLDER}/ibmtpm-mainline-awslc.patch"
49-
echo "Apply patch $patchfile..."
50-
patch -p1 --quiet -i "$patchfile"
51-
}
52-
5346
git clone https://github.com/kgoldman/ibmswtpm2.git ${IBMTPM_SRC_FOLDER}
5447
cd ${IBMTPM_SRC_FOLDER}
5548
mkdir -p ${AWS_LC_BUILD_FOLDER} ${AWS_LC_INSTALL_FOLDER}
@@ -59,6 +52,5 @@ aws_lc_build "$SRC_ROOT" "$AWS_LC_BUILD_FOLDER" "$AWS_LC_INSTALL_FOLDER" -DCMAKE
5952

6053
# Build ibmtpm from source.
6154
pushd ${IBMTPM_SRC_FOLDER}
62-
ibmtpm_patch_build
6355
ibmtpm_build
6456
popd

0 commit comments

Comments
 (0)