vtpm : apply patches in ordered way

Signed-off-by: Shahriyar Jalayeri <shahriyar@zededa.com>
uncleDecart · Oct 11, 2024 · f93c3b5 · f93c3b5
1 parent af9391f
commit f93c3b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/vtpm/Dockerfile b/pkg/vtpm/Dockerfile
@@ -43,8 +43,11 @@ RUN strip --strip-unneeded /out/usr/lib/libtss2*.so*
 # build tpm2-tools, it is needed by ptpm
 WORKDIR /tpm2-tools
 ADD --keep-git-dir=true https://github.com/tpm2-software/tpm2-tools.git#5.5 /tpm2-tools
-COPY patch/patch-tpm2-tools.diff .
-RUN patch -p1 < patch-tpm2-tools.diff
+COPY patches/ /patches/
+RUN for patch in /patches/*.patch; do \
+        echo "Applying $patch"; \
+        patch -d /tpm2-tools -p1 < "$patch" || exit 1 ; \
+    done
 RUN ./bootstrap && \
     ./configure && \
     make -j$(nproc)

diff --git a/pkg/vtpm/patch/patch-tpm2-tools.diff → ...-tpm2-tools-libcommon-as-shared-lib.patch b/pkg/vtpm/patch/patch-tpm2-tools.diff → ...-tpm2-tools-libcommon-as-shared-lib.patch