Skip to content

[Backport release-23.05] edk2: 202211 -> 202305#242473

Merged
RaitoBezarius merged 1 commit intoNixOS:release-23.05from
Luflosi:backport-241786-to-release-23.05
Jul 19, 2023
Merged

[Backport release-23.05] edk2: 202211 -> 202305#242473
RaitoBezarius merged 1 commit intoNixOS:release-23.05from
Luflosi:backport-241786-to-release-23.05

Conversation

@Luflosi
Copy link
Contributor

@Luflosi Luflosi commented Jul 9, 2023

Description of changes

https://github.com/tianocore/edk2/releases/tag/edk2-stable202305

Backport of #241786 to release-23.05.

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/)
  • 23.11 Release Notes (or backporting 23.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.

@ofborg ofborg bot requested review from LunNova and RaitoBezarius July 9, 2023 13:26
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 9, 2023
@LunNova LunNova added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jul 9, 2023
@nixos-discourse
Copy link

nixos-discourse commented Jul 19, 2023

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2433

@RaitoBezarius RaitoBezarius merged commit 242a519 into NixOS:release-23.05 Jul 19, 2023
@Luflosi Luflosi deleted the backport-241786-to-release-23.05 branch July 19, 2023 17:07
@vcunat
Copy link
Member

vcunat commented Jul 20, 2023 •
edited
Loading

This merge broke nixosTests.boot.uefiCdrom (stuck and times out), blocking nixos-23.05* channels.

I retried a few times on this merge's commit on different machines. (And on the parent commit it succeeded.) Hydra's build: https://hydra.nixos.org/build/228459270#tabs-buildsteps EDIT: also, reverting this on latest 23.05 fixed the test for me.

@vcunat
Copy link
Member

vcunat commented Jul 20, 2023 •
edited
Loading

Note that on unstable/master the same test seems OK. EDIT: also OK on aarch64-linux.

@RaitoBezarius
Copy link
Member

RaitoBezarius commented Jul 20, 2023

I will try to take a look in some hours if that's okay for you.

@vcunat
Copy link
Member

vcunat commented Jul 20, 2023

Sure. In the worst case we can revert later today, so that at least other (security) fixes get into channels.

vcunat added a commit that referenced this pull request Jul 20, 2023
@vcunat
Revert Merge #242473: edk2: 202211 -> 202305
fa793b0 
This reverts commit 242a519, reversing
changes made to 1e135b3.

See that PR for discussion.  Channels would keep blocked without this.
@vcunat
Copy link
Member

vcunat commented Jul 21, 2023

Perhaps just patch the CVE instead of backporting update?

@RaitoBezarius
Copy link
Member

RaitoBezarius commented Jul 21, 2023

OK, will do now.

@RaitoBezarius RaitoBezarius mentioned this pull request Jul 21, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LunNova LunNova Awaiting requested review from LunNova

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Luflosi @nixos-discourse @vcunat @RaitoBezarius @LunNova