-
Notifications
You must be signed in to change notification settings - Fork 191
osbuild: Update nvidiabluefield manifest to use up to date capsule file for secure boot #4575
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.
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
Open
eelgaev
wants to merge
4
commits into
coreos:main
Choose a base branch
from
eelgaev:bfb-cap
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+70
−11
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f7a87a7
osbuild: add up-to-date capsule file rpm with RH Secure boot certific…
eelgaev 61f3622
osbuild: BFB rpms now use DOCA 3.2.x LTS
eelgaev a28a7a0
osbuild: remove a kernel module blacklisting workaround
eelgaev 3c9e8e8
osbuild: add patch for BFB stage
eelgaev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
src/0001-stages-bfb-use-RedHat-capsule-and-drop-mlxbf_pmc-blacklist.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Eli Elgaev <eelgaev@redhat.com> | ||
| Date: Sun, 8 Jun 2026 00:00:00 +0000 | ||
| Subject: [PATCH] stages/bfb: use RedHat capsule and drop mlxbf_pmc blacklist | ||
|
|
||
| Use the Red Hat secure boot capsule file instead of the Mellanox | ||
| boot_update2.cap, and remove the modprobe.blacklist=mlxbf_pmc kernel | ||
| argument which is no longer needed. | ||
|
|
||
| https://github.com/osbuild/osbuild/pull/2470 | ||
| --- | ||
| stages/org.osbuild.bfb | 5 ++--- | ||
| stages/org.osbuild.bfb.meta.json | 3 +-- | ||
| 2 files changed, 3 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/stages/org.osbuild.bfb b/stages/org.osbuild.bfb | ||
| index 9f16ed58..4b43016e 100755 | ||
| --- a/stages/org.osbuild.bfb | ||
| +++ b/stages/org.osbuild.bfb | ||
| @@ -17,7 +17,7 @@ import osbuild.api | ||
| # | ||
| # Hardcode some firmware file paths in constants that we use below | ||
| DEFAULT_BFB_PATH = "/lib/firmware/mellanox/boot/default.bfb" | ||
| -BOOT_CAPSULE_PATH = "/lib/firmware/mellanox/boot/capsule/boot_update2.cap" | ||
| +BOOT_CAPSULE_PATH = "/usr/share/redhat-cap/RedHat.cap" | ||
|
|
||
|
|
||
| def parse_input(inputs, name): | ||
| @@ -52,8 +52,7 @@ def main(inputs, output, options): | ||
| "console=hvc0", | ||
| "console=ttyAMA0", | ||
| "earlycon=pl011,0x13010000", | ||
| - "initrd=initramfs", | ||
| - "modprobe.blacklist=mlxbf_pmc" | ||
| + "initrd=initramfs" | ||
| ] | ||
| boot_args_v0 = " ".join(options.get("boot_args_v0", default_args_v0)) | ||
| boot_args_v2 = " ".join(options.get("boot_args_v2", default_args_v2)) | ||
| diff --git a/stages/org.osbuild.bfb.meta.json b/stages/org.osbuild.bfb.meta.json | ||
| index c519a1f8..c40a9ee2 100644 | ||
| --- a/stages/org.osbuild.bfb.meta.json | ||
| +++ b/stages/org.osbuild.bfb.meta.json | ||
| @@ -55,8 +55,7 @@ | ||
| "console=hvc0", | ||
| "console=ttyAMA0", | ||
| "earlycon=pl011,0x13010000", | ||
| - "initrd=initramfs", | ||
| - "modprobe.blacklist=mlxbf_pmc" | ||
| + "initrd=initramfs" | ||
| ] | ||
| }, | ||
| "boot_path": { | ||
| -- | ||
| 2.49.0 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The newly added
redhat-capRPM is sourced from a GitHub release (NVIDIA/doca-platform), which is outside the Mellanox DOCA repository. However, its corresponding GPG public key has not been added to thegpgkeyslist of theorg.osbuild.rpmstage (which currently only contains the Mellanox Technologies signing key).\n\nBecause OSBuild enforces GPG signature verification for all packages in theorg.osbuild.rpmstage, installingredhat-capwill fail during the build due to a missing or mismatched GPG key.\n\nTo resolve this, the GPG public key used to sign theredhat-capRPM must be added to thegpgkeyslist under theorg.osbuild.rpmstage options.