qcom-capsule: upgrade and use qcom-capsule-tool unified CLI#2288
Merged
ricardosalveti merged 2 commits intoMay 29, 2026
Merged
Conversation
igoropaniuk
requested review from
anujm1,
koenkooi,
lumag,
ndechesne,
ricardosalveti,
sbanerjeeqc and
vkraleti
as code owners
igoropaniuk
changed the title
Bump SRCREV to a19e5b6 to pick up the upstream restructure of
uefi_capsule_generation into a proper Python package
(pyproject.toml + src/qcom_capsule_tool layout) with a unified
qcom-capsule-tool CLI dispatcher.
Switch from hand-copying individual .py files to ${datadir} to
installing the package via python_poetry_core, so the tool is
available as a single qcom-capsule-tool binary in PATH and its
internal imports resolve correctly.
Drop the local FVCreation PATH-fallback patch, which is now
upstream (commit 352ec67, "uefi_capsule: fall back to PATH when
locating GenFfs/GenFv").
Refresh DEPENDS: add python3-requests-native, which the upgraded
tool now imports. dtc-native and edk2-basetools-native are
retained because the tool's "create" pipeline shells out to dtc
and GenerateCapsule.py at runtime, and consumers of the tool
rely on those staging relationships as well.
FvUpdate.xml ships alongside pyproject.toml and is not picked up
by the Python install, so stage it explicitly to ${datadir} for
the consumer bbclass to fall back to.
Signed-off-by: Igor Opaniuk <igor.opaniuk@oss.qualcomm.com>
Replace direct python3 invocations of the individual
uefi_capsule_generation scripts with the new qcom-capsule-tool
CLI dispatcher introduced upstream in cbsp-boot-utilities, which
installs as a proper Python package with a single entry point in
PATH.
Mapping of replaced calls:
BinToHex.py -> qcom-capsule-tool bin-to-hex
xblconfig_parser.py -> qcom-capsule-tool parse-config
set_dtb_property.py -> qcom-capsule-tool set-dtb-property
SYSFW_VERSION_program.py-> qcom-capsule-tool sysfw-version-create
FVCreation.py -> qcom-capsule-tool fv-create
UpdateJsonParameters.py -> qcom-capsule-tool update-json
The GenerateCapsule.py call from edk2-basetools is unchanged
since it is not part of cbsp-boot-utilities.
Rename CBSP_SCRIPTS to CBSP_DATA: with the upgraded recipe that
path holds only FvUpdate.xml, while the executable lives in
${STAGING_BINDIR_NATIVE}.
Signed-off-by: Igor Opaniuk <igor.opaniuk@oss.qualcomm.com>
igoropaniuk
force-pushed
the
feat/cbsp-boot-utilities-upgrade
branch
from
081eccf to
1821438
Compare
Test Results 103 files ± 0 632 suites ±0 5h 3m 41s ⏱️ + 5m 31s For more details on these failures, see this check. Results for commit 1821438. ± Comparison against base commit 5716703. This pull request removes 3 tests.♻️ This comment has been updated with latest results. |
ricardosalveti
approved these changes
May 28, 2026
lumag
approved these changes
May 28, 2026
ricardosalveti
merged commit bc294aa
into
qualcomm-linux:master
253 of 254 checks passed
Contributor
|
Successfully created backport PR for |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Bump SRCREV to
a19e5b6to pick up the upstream restructure ofuefi_capsule_generationinto a proper Python package(pyproject.toml + src/qcom_capsule_tool layout) with a unified
qcom-capsule-tool CLI dispatcher.
Replace direct python3 invocations of the individual
uefi_capsule_generationscripts with the newqcom-capsule-toolCLI dispatcher introduced upstream in
cbsp-boot-utilities, whichinstalls as a proper Python package with a single entry point in
PATH.
Mapping of replaced calls: