Skip to content

Extend SBOM - #859

Merged
SergiiDmytruk merged 6 commits into
dasharofrom
extend-sbom
Mar 18, 2026
Merged

Extend SBOM#859
SergiiDmytruk merged 6 commits into
dasharofrom
extend-sbom

Conversation

@filipleple

@filipleple filipleple commented Mar 5, 2026

Copy link
Copy Markdown
Member

ref: sha-1633

@filipleple filipleple self-assigned this Mar 5, 2026
@filipleple filipleple closed this Mar 10, 2026
@filipleple filipleple reopened this Mar 10, 2026
@filipleple

Copy link
Copy Markdown
Member Author

Needs Dasharo/dasharo-sdk#14

@filipleple
filipleple force-pushed the extend-sbom branch 2 times, most recently from 9c646f8 to c1a2377 Compare March 10, 2026 15:06
@filipleple
filipleple marked this pull request as ready for review March 10, 2026 15:08
Comment thread src/sbom/Kconfig Outdated
Comment thread src/sbom/Makefile.mk Outdated
Comment thread src/sbom/Makefile.mk Outdated
Comment thread src/sbom/Makefile.mk Outdated
Comment thread src/sbom/Makefile.mk Outdated
Comment thread src/sbom/Makefile.mk Outdated
@SergiiDmytruk

Copy link
Copy Markdown
Member

Pushed a related fix for the build after git worktree add ../worktree && cd ../worktree when .git is not a directory.

@SergiiDmytruk SergiiDmytruk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Given fwupd/fwupd#9980 (comment), should we fork and add missing hashes to goswid or is it something for the future?

Comment thread src/sbom/Makefile.mk Outdated
@filipleple

Copy link
Copy Markdown
Member Author

@SergiiDmytruk since I've already played a bit too long with this "PoC check" task, I think the goswid fix would have to be left for a later upcoming iteration

SergiiDmytruk
SergiiDmytruk previously approved these changes Mar 17, 2026
Comment thread src/sbom/Makefile.mk
@filipleple

Copy link
Copy Markdown
Member Author

@SergiiDmytruk rebased onto dasharo and added in iPXE versioning while at it, that dismissed the approve, sorry 😬

filipleple and others added 6 commits March 18, 2026 16:43
Extend to include most used components, e.g. FSP, ME, IFD, microcode,
edk2, AGESA, EC.

Upstream-Status: Pending
Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>
Change-Id: Ie13b9226dd174e151605e283093a0e84aa18eada
Upstream-Status: Pending
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
1. Kconfig SBOM_INTEL_FSP_PATH default: Changed
"build/sbom/intel-fsp.json" → "src/sbom/intel-fsp.json" (static path for
user-supplied files belongs in src/, not build/).
2. cp $< $@: Replaced cp $(src-dir)/intel-fsp.json $@ with cp $< $@
(line 263), consistent with other rules.
3. strip_quotes for CONFIG_FSP_FD_PATH: Added it to the top strip
section (line 20) and replaced the inline patsubst "%",%,... shell
assignment with direct use of $(CONFIG_FSP_FD_PATH).
4. Redundant | head -1: Removed from the AGESA version extraction
pipeline (line 299) — grep -m1 already limits to one match.
5. vboot-gitdir simplification: Replaced the 7-line manual .git file
--detection with git -C 3rdparty/vboot rev-parse absolute-git-dir
--2>/dev/null (one line, handles both regular checkouts and submodules).
6. sbom in help target: Added make sbom entry to the Makefile help
output.

Upstream-Status: Pending
Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>
Upstream-Status: Pending
Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>
Upstream-Status: Pending
Signed-off-by: Filip Lewiński <filip.lewinski@3mdeb.com>
Change-Id: Ic7cf27b77cf400470e986959fcca3de076817207
Upstream-Status: Inappropriate [Dasharo downstream]
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>

@SergiiDmytruk SergiiDmytruk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested iPXE SBOM generation, added a comment about sbom target not being reliable and rebased again because dasharo has moved.

@SergiiDmytruk
SergiiDmytruk merged commit ebb924b into dasharo Mar 18, 2026
63 checks passed
@SergiiDmytruk
SergiiDmytruk deleted the extend-sbom branch March 18, 2026 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants