Skip to content

sgx-sdk, sgx-psw: 2.14 -> 2.15.1#149948

Merged
bobby285271 merged 1 commit intoNixOS:masterfrom
veehaitch:sgx-sdk-2.15.1
Dec 17, 2021
Merged

sgx-sdk, sgx-psw: 2.14 -> 2.15.1#149948
bobby285271 merged 1 commit intoNixOS:masterfrom
veehaitch:sgx-sdk-2.15.1

Conversation

@veehaitch
Copy link
Member

@veehaitch veehaitch commented Dec 10, 2021 •
edited
Loading

Motivation for this change

Also add some of the new samples as tests. Disable parallel builds for
the samples as they don't seem to support it (fail randomly).

Still a draft. Waiting for #148593.

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, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from arcz and sbellem December 10, 2021 01:09
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Dec 10, 2021
blitz
blitz approved these changes Dec 10, 2021
View reviewed changes
pkgs/os-specific/linux/sgx-sdk/samples.nix Outdated
Copy link
Contributor

@blitz blitz Dec 10, 2021

Choose a reason for hiding this comment

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

nit: Was parallel building buggy?

Copy link
Member Author

@veehaitch veehaitch Dec 10, 2021

Choose a reason for hiding this comment

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

Yes, it failed randomly. Also, it's not too important to have it for the samples: they're tiny and build quickly.

Copy link
Member

@Mic92 Mic92 Dec 15, 2021

Choose a reason for hiding this comment

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

Please switch to false instead and maybe add a comment. There are efforts to build all packages eventually in parallel.

Copy link
Member Author

@veehaitch veehaitch Dec 15, 2021

Choose a reason for hiding this comment

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

That makes sense, thanks. Force-pushed a new version.

@veehaitch veehaitch marked this pull request as ready for review December 13, 2021 14:30
@veehaitch veehaitch changed the title sgx-sdk: 2.14 -> 2.15.1 sgx-sdk, sgx-psw: 2.14 -> 2.15.1 Dec 13, 2021
@veehaitch
Copy link
Member Author

veehaitch commented Dec 13, 2021

Rebased, as #148593 is merged. I didn't test the AESM service on an SGX machine yet.

@ofborg ofborg bot requested a review from RealityAnomaly December 13, 2021 14:46
@ofborg ofborg bot removed the 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. label Dec 13, 2021
@veehaitch
Copy link
Member Author

veehaitch commented Dec 13, 2021

I didn't test the AESM service on an SGX machine yet.

Works fine!

@blitz
Copy link
Contributor

blitz commented Dec 14, 2021

@veehaitch The AESM daemon runs fine. sgx-detect is happy after manually linking /dev/sgx_enclave to /dev/sgx/enclave. Weird. Not sure why the device node changed, but this is unrelated to the SGX userspace code.

Good to merge from my end.

@veehaitch veehaitch requested a review from Mic92 December 14, 2021 18:49
@veehaitch
sgx-sdk, sgx-psw: 2.14 -> 2.15.1
4f7f8d0 
Also add some of the new samples as tests. Disable parallel builds for
the samples as they don't seem to support it (fail randomly).
@bobby285271 bobby285271 merged commit b4693d8 into NixOS:master Dec 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@arcz arcz Awaiting requested review from arcz

@RealityAnomaly RealityAnomaly Awaiting requested review from RealityAnomaly

@Mic92 Mic92 Awaiting requested review from Mic92

2 more reviewers

@blitz blitz blitz approved these changes

@sbellem sbellem sbellem approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@veehaitch @blitz @Mic92 @sbellem @bobby285271