Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/pip3-withoutupgrade.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
ENV PIP_BREAK_SYSTEM_PACKAGES=1
# install everything in one shot so we don't get a newer version of a package we specified. Ie if a module has dep on cryptogtraphy
# and we install it in different phases pip will upgrade cryptography
RUN pkgs="cryptography==$PYCRYPTO_VERSION pyyaml cpp-coveralls pyasn1 pyasn1_modules python-pkcs11 \
RUN pkgs="cryptography==$PYCRYPTO_VERSION pyyaml cpp-coveralls pyasn1 pyasn1_modules python-pkcs11 compiledb \
bcrypt==$PYBCRYPT_VERSION setuptools"; \
pkgs=$(echo "$pkgs" | sed -E 's/==\s+/ /g'); \
python3 -m pip install $pkgs --break-system-packages
20 changes: 14 additions & 6 deletions modules/swtpm.m4
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
RUN git -C /tmp clone --depth=1 https://github.com/stefanberger/libtpms.git \
&& cd /tmp/libtpms \
ARG version=0.10.1
RUN cd /tmp/ \
&& wget $WGET_EXTRA_FLAGS -L https://github.com/stefanberger/libtpms/archive/refs/tags/v$version.tar.gz \
&& tar xv --no-same-owner -f v$version.tar.gz \
&& cd /tmp/libtpms-$version \
&& ./autogen.sh --prefix=/usr $LIBTPMS_AUTOGEN_EXTRA --with-openssl --with-tpm2 \
&& make -j$(nproc) \
&& make install \
&& rm -fr /tmp/libtpms \
&& git -C /tmp clone --depth=1 https://github.com/stefanberger/swtpm.git \
&& cd /tmp/swtpm \
&& cd /tmp/ \
&& rm -fr /tmp/libtpms-$version \
&& rm -f /tmp/v$version.tar.gz \
&& wget $WGET_EXTRA_FLAGS -L https://github.com/stefanberger/swtpm/archive/refs/tags/v$version.tar.gz \
&& tar xv --no-same-owner -f v$version.tar.gz \
&& cd /tmp/swtpm-$version \
&& ./autogen.sh --prefix=/usr \
&& make -j$(nproc) $SWTPM_MAKE_EXTRA \
&& make install \
&& rm -fr /tmp/swtpm
&& cd /tmp/ \
&& rm -fr /tmp/swtpm-$version \
&& rm -f /tmp/v$version.tar.gz
Loading