Skip to content

systemd: add missing TPM2 build dependencies#139864

Merged
flokli merged 2 commits intoNixOS:stagingfrom
ymatsiuk:systemdtpm2
Oct 7, 2021
Merged

systemd: add missing TPM2 build dependencies#139864
flokli merged 2 commits intoNixOS:stagingfrom
ymatsiuk:systemdtpm2

Conversation

@ymatsiuk
Copy link
Contributor

@ymatsiuk ymatsiuk commented Sep 29, 2021 •
edited by flokli
Loading

Motivation for this change

before:

result/bin/systemd-cryptenroll --tpm2-device=list
TPM2 not supported on this build.

after:

result/bin/systemd-cryptenroll --tpm2-device=list
PATH        DEVICE     DRIVER
/dev/tpmrm0 STM0125:00 tpm_tis

Fixes #139433.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ymatsiuk ymatsiuk requested a review from andir September 29, 2021 09:22
@github-actions github-actions bot added the 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. label Sep 29, 2021
@ofborg ofborg bot requested review from edolstra, flokli and kloenk September 29, 2021 09:42
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Sep 29, 2021
@kloenk
Copy link
Member

kloenk commented Sep 29, 2021

This should target staging as it's a mass rebuild

@ymatsiuk ymatsiuk changed the base branch from master to staging September 29, 2021 09:55
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. labels Sep 29, 2021
@ymatsiuk
Copy link
Contributor Author

ymatsiuk commented Oct 1, 2021

Tests will follow soon, finalizing some minor issues

@ofborg ofborg bot removed 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. labels Oct 1, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. labels Oct 1, 2021
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Oct 2, 2021
@ymatsiuk
Copy link
Contributor Author

ymatsiuk commented Oct 2, 2021

tagging @cwyc and @flokli from #134577

flokli
flokli reviewed Oct 4, 2021
View reviewed changes
Copy link
Member

@flokli flokli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently running the build, will report back. Some nits.

@flokli
Copy link
Member

flokli commented Oct 4, 2021

Tests succeeded 🎉 So we should probably just extend /etc/crypttab setup and add this to all-tests.nix.

@ymatsiuk ymatsiuk force-pushed the systemdtpm2 branch 2 times, most recently from c7f5148 to ac90ac6 Compare October 4, 2021 11:04
@ymatsiuk
Copy link
Contributor Author

ymatsiuk commented Oct 4, 2021

Thanks for the review @flokli

@ymatsiuk ymatsiuk requested a review from flokli October 4, 2021 11:05
flokli
flokli requested changes Oct 7, 2021
View reviewed changes
@flokli flokli mentioned this pull request Oct 7, 2021
Closed
@ymatsiuk
Copy link
Contributor Author

ymatsiuk commented Oct 7, 2021

I've separated the test to logical blocks and added comments for the context

flokli
flokli reviewed Oct 7, 2021
View reviewed changes
@flokli flokli mentioned this pull request Oct 7, 2021
Closed
@ofborg ofborg bot requested a review from flokli October 7, 2021 13:33
flokli
flokli approved these changes Oct 7, 2021
View reviewed changes
Copy link
Member

@flokli flokli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks a lot for being patient with my nitpicks ;-)

@ofborg ofborg bot requested a review from flokli October 7, 2021 15:57
@flokli flokli merged commit 643f23f into NixOS:staging Oct 7, 2021
@ymatsiuk ymatsiuk deleted the systemdtpm2 branch October 8, 2021 08:00
@ymatsiuk ymatsiuk mentioned this pull request Apr 9, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andir andir Awaiting requested review from andir

@kloenk kloenk Awaiting requested review from kloenk

@edolstra edolstra Awaiting requested review from edolstra

@aszlig aszlig Awaiting requested review from aszlig

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@ttuegel ttuegel Awaiting requested review from ttuegel

@flokli flokli Awaiting requested review from flokli

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ymatsiuk @kloenk @flokli