Skip to content

[Backport staging-next-23.11] OVMF: fix buils against openssl-3.0.13#289298

Merged
vcunat merged 1 commit intostaging-next-23.11from
backport-287266-to-release-23.11
Feb 16, 2024
Merged

[Backport staging-next-23.11] OVMF: fix buils against openssl-3.0.13#289298
vcunat merged 1 commit intostaging-next-23.11from
backport-287266-to-release-23.11

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Feb 16, 2024

Bot-based backport to release-23.11, triggered by a label in #287266.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

Without the change the build fails on `staging-next` as
https://hydra.nixos.org/build/248863953/nixlog/2/tail:

    /build/edk2-unvendored-src/CryptoPkg/Library/OpensslLib/openssl/crypto/property/property_parse.c:107:19: error: ‘INT64_MAX’ undeclared (first use in this function)
      107 |         if (v > ((INT64_MAX - (*s - '0')) / 10)) {
          |                   ^~~~~~~~~

The unbundled version of `openssl` `nixpkgs` injects into `edk2` started
using `INT64_MAX` that `edk2`'s `<stdint.h>` does not provide and relies
on `openssl` to define as a fallback.

Let's pull in `openssl`'s own definition of those.

(cherry picked from commit 7b01dd0)
@vcunat vcunat changed the base branch from release-23.11 to staging-next-23.11 February 16, 2024 15:04
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Feb 16, 2024
@vcunat vcunat changed the base branch from staging-next-23.11 to release-23.11 February 16, 2024 15:04
@vcunat vcunat changed the base branch from release-23.11 to staging-next-23.11 February 16, 2024 15:05
@github-actions github-actions bot removed the 6.topic: kernel The Linux kernel label Feb 16, 2024
@vcunat vcunat changed the title [Backport release-23.11] OVMF: fix buils against openssl-3.0.13 [Backport staging-next-23.11] OVMF: fix buils against openssl-3.0.13 Feb 16, 2024
@Ma27
Copy link
Member

Ma27 commented Feb 16, 2024

This accidental ping was actually good because I was initially wondering last night why OVMF was breaking on the glibc update branch, but apparently I've compared against an eval that's too new 😅

@ofborg ofborg bot requested review from LunNova and adamcstephens February 16, 2024 15:24
@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. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. and removed 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 Feb 16, 2024
@vcunat vcunat merged commit eb89437 into staging-next-23.11 Feb 16, 2024
@vcunat vcunat deleted the backport-287266-to-release-23.11 branch February 16, 2024 15:37
@vcunat
Copy link
Member

vcunat commented Feb 16, 2024

Oh, I'm sorry about the pings. I didn't even notice.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants