Skip to content

Commit 80fb22a

Browse files
Update documentation and CI about deps to install to build TPM
We no longer need autotools to build the TPM, but cmake instead. `gcc-c++` is required by the cmake project, otherwise the "No CMAKE_CXX_COMPILER could be found" error is printed. Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
1 parent f4fadcc commit 80fb22a

5 files changed

Lines changed: 7 additions & 8 deletions

File tree

.github/workflows/publish-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
override: true
2929

3030
- name: Install TPM 2.0 Reference Implementation build dependencies
31-
run: sudo apt install -y autoconf autoconf-archive pkg-config build-essential automake
31+
run: sudo apt install -y build-essential cmake pkg-config
3232

3333
- uses: actions/setup-python@v5
3434
with:

.github/workflows/qemu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
--profile minimal
113113
114114
- name: Install TPM 2.0 Reference Implementation build dependencies
115-
run: sudo apt install -y autoconf autoconf-archive pkg-config build-essential automake
115+
run: sudo apt install -y build-essential cmake pkg-config
116116

117117
- name: Build SVSM
118118
run: cargo xbuild configs/qemu-target.json

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: cargo update --workspace --locked
3030

3131
- name: Install TPM 2.0 Reference Implementation build dependencies
32-
run: sudo apt install -y autoconf autoconf-archive pkg-config build-essential automake
32+
run: sudo apt install -y build-essential cmake pkg-config
3333

3434
- name: Build debug image
3535
run: cargo xbuild ./configs/*

Documentation/docs/installation/INSTALL.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,8 @@ You may also need to install the TPM 2.0 Reference Implementation build
203203
dependencies. On OpenSUSE you can do this by:
204204

205205
```
206-
$ sudo zypper in system-user-mail make gcc curl patterns-devel-base-devel_basis \
207-
glibc-devel-static git libclang13 autoconf autoconf-archive pkg-config \
208-
automake perl
206+
$ sudo zypper in system-user-mail make gcc gcc-c++ curl patterns-devel-base-devel_basis \
207+
glibc-devel-static git libclang13 cmake pkg-config perl
209208
```
210209

211210
Then checkout the SVSM repository and build the SVSM binary:

scripts/container/opensuse-rust.docker

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ ENV RUSTUP_HOME=/opt/rustup
2323
SHELL ["/bin/bash", "-c"]
2424

2525
RUN zypper ref && zypper dup -y && \
26-
zypper install -y system-user-mail make gcc curl \
26+
zypper install -y system-user-mail make gcc gcc-c++ curl \
2727
patterns-devel-base-devel_basis glibc-devel-static git libclang13 \
28-
autoconf autoconf-archive pkg-config automake perl && \
28+
cmake pkg-config perl && \
2929
useradd -u $USER_ID -m $USER_NAME && \
3030
mkdir -p "${CARGO_HOME}" "${RUSTUP_HOME}" && \
3131
chown "${USER_NAME}" "${CARGO_HOME}" "${RUSTUP_HOME}"

0 commit comments

Comments
 (0)