Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libtcgtpm: use bindgen in build.rs instead of bindgen-cli in Makefile #606

Merged
merged 1 commit into from
Feb 14, 2025
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
16 changes: 3 additions & 13 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ jobs:
override: true
components: rustfmt, rust-src, clippy

- name: Install bindgen-cli
uses: actions-rs/cargo@v1
with:
command: install
args: bindgen-cli

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

Expand Down Expand Up @@ -112,13 +106,6 @@ jobs:
override: true
components: rustfmt

# The bindings.rs is auto-generated during make, but we are not
# building the code with nightly. So we initialize bindings.rs here
# for cargo-fmt in the next workflow, otherwise it will fail reporting
# that bindings.rs does not exist.
- name: Touch libtcgtpm bindings
run: echo "" > libtcgtpm/src/bindings.rs

# release/src/git_version.rs is auto-generated via a build.rs file. Touch
# it here to avoid CI failures.
- name: Touch release/src/git_version.rs
Expand Down Expand Up @@ -154,6 +141,9 @@ jobs:
override: true
components: rustfmt, rust-src, clippy

# TODO: remove this step after merging https://github.com/coconut-svsm/svsm/pull/606
# This is still required because here we checkout the `base` branch that
# still requires `bindgen-cli` to build libtcgtpm
- name: Install bindgen-cli
uses: actions-rs/cargo@v1
with:
Expand Down
176 changes: 163 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Documentation/docs/installation/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ Then checkout the SVSM repository and build the SVSM binary:
$ git clone https://github.com/coconut-svsm/svsm
$ cd svsm
$ git submodule update --init
$ cargo install bindgen-cli
```

That checks out the SVSM which can be built by
Expand Down
Loading
Loading