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.

Sign up for GitHub

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

Jump to bottom

Update shim to 15.8 #8406

Open
wants to merge 17 commits into
base: 3.0-dev
Choose a base branch
from
Open

Update shim to 15.8 #8406

wants to merge 17 commits into from

Conversation

ddstreetmicrosoft
Copy link
Contributor

@ddstreetmicrosoft ddstreetmicrosoft commented Mar 14, 2024 •
edited
Loading

Rework our 3.0 shim, as well as updating it to 15.8.

Upstream review opened: rhboot/shim-review#427

@ddstreetmicrosoft
Copy link
Contributor Author

@christopherco @adithyaj

@ddstreetmicrosoft
Copy link
Contributor Author

note that I got rid of the shim-unsigned package as it didn't make sense to me...but if we should keep it i'm open to discussion

@ddstreetmicrosoft ddstreetmicrosoft force-pushed the ddstreet/shim branch 5 times, most recently from 690fd2c to 4650129 Compare March 15, 2024 16:55
@christopherco
Copy link
Contributor

note that I got rid of the shim-unsigned package as it didn't make sense to me...but if we should keep it i'm open to discussion

Supportive of removing shim-unsigned.

Also, I noticed you are renaming shim-unsigned-aarch64 to shim-unsigned-aa64. Any concerns on keeping shim-unsigned-aarch64? The main benefit is that it aligns with familiar Fedora package naming.

@ddstreetmicrosoft ddstreetmicrosoft force-pushed the ddstreet/shim branch 3 times, most recently from 0607934 to df54566 Compare April 3, 2024 21:29
gjswalling
gjswalling reviewed Apr 9, 2024
View reviewed changes
SPECS/shim/TESTING Outdated Show resolved Hide resolved
@ddstreetmicrosoft
Copy link
Contributor Author

note that I got rid of the shim-unsigned package as it didn't make sense to me...but if we should keep it i'm open to discussion

Supportive of removing shim-unsigned.

Also, I noticed you are renaming shim-unsigned-aarch64 to shim-unsigned-aa64. Any concerns on keeping shim-unsigned-aarch64? The main benefit is that it aligns with familiar Fedora package naming.

yeah migth as well just keep the naming the same, i adjusted to remove the rename in latest push

@ddstreetmicrosoft ddstreetmicrosoft marked this pull request as ready for review April 11, 2024 12:26
@ddstreetmicrosoft ddstreetmicrosoft requested review from a team as code owners April 11, 2024 12:26
@ddstreetmicrosoft ddstreetmicrosoft force-pushed the ddstreet/shim branch 7 times, most recently from 23d2279 to fabbaec Compare April 11, 2024 20:58
@gjswalling gjswalling mentioned this pull request Apr 11, 2024
Closed
@ddstreetmicrosoft
Copy link
Contributor Author

rebased

ddstreet and others added 10 commits June 14, 2024 10:47
@ddstreet @ddstreetmicrosoft
shim-unsigned: remove unneeded package
bfc967a
@ddstreet @ddstreetmicrosoft
shim-unsigned-aarch64: update from fedora, update to 15.8
774281e
@ddstreet @ddstreetmicrosoft
shim-unsigned-x64: update from fedora, update to 15.8
6f416f5
@ddstreetmicrosoft
shim: update to 15.8; include mm, fb, and BOOT.CSV
d8f257f 
Also include temporary *unsigned* shim efi files to make toolkit
happy...this won't be usable with secure boot until the upstream shim
review(s) are complete
@ddstreetmicrosoft
toolkit: add shim packages to check_entangled_specs
af18db7
@ddstreetmicrosoft
grub2: move EFI binary from BOOT to %{efidir}
3c6b275
@ddstreetmicrosoft
grub2: require use of new shim and grub2 together
a31d643 
The shim and grub2 need to coordinate their location at %{efidir}
instead of BOOT, so require the proper versions together using
Conflicts:
@ddstreetmicrosoft
update licenses
4388b0d
@ddstreetmicrosoft
shim: add TESTING file describing how to perform local EFI binary sig…
229bd95 
…ning for testing
@ddstreetmicrosoft
SPECS-SIGNED/shim: create as symlink to SPECS/shim
03061b3
@ddstreetmicrosoft ddstreetmicrosoft force-pushed the ddstreet/shim branch 5 times, most recently from 810a0d8 to c67f9da Compare June 14, 2024 15:20
@trungams trungams added the 3.0-dev PRs Destined for AzureLinux 3.0 label Jun 17, 2024
@trungams trungams mentioned this pull request Jun 19, 2024
Merged
13 tasks
trungams
trungams reviewed Jun 25, 2024
View reviewed changes
SPECS/shim/shim.spec
Release: 2%{?dist}
Name: shim-%{efiarch}
Version: 15.8
Release: 3%{?dist}
Copy link
Member

Choose a reason for hiding this comment

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

Release number should be 1?

gjswalling
gjswalling approved these changes Aug 28, 2024
View reviewed changes
SPECS/shim/TESTING Outdated Show resolved Hide resolved
SPECS/shim-unsigned-x64/sbat.azurelinux.csv
@@ -0,0 +1 @@
shim.azurelinux,1,Microsoft,shim,15.8,https://github.com/microsoft/azurelinux
Copy link
Contributor

Choose a reason for hiding this comment

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

do we have to hard-code the version here (and in aarch64 file)? Can we keep the sed line and @@VERSION_RELEASE@@ to ensure these versions are kept in sync?

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

@trungams trungams trungams left review comments

@adithyaj adithyaj adithyaj requested changes

@gjswalling gjswalling gjswalling approved these changes

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
3.0-dev PRs Destined for AzureLinux 3.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ddstreetmicrosoft @christopherco @dmcilvaney @adithyaj @trungams @gjswalling @ddstreet