image_types_qcom: include *.img in qcomflash bundle whitelist#2172
Merged
lumag merged 1 commit intoMay 13, 2026
Merged
Conversation
The boot-firmware deploy loop in create_qcomflash_pkg only picks up a fixed set of file patterns (*.elf, *.mbn*, *.melf*, *.fv, named *.bin families, etc.). Boards whose LUN payloads are deployed as raw *.img files therefore never make it into the qcomflash tarball, even though the firmware recipe deploys them into QCOM_BOOT_FILES_SUBDIR. In particular, the Thundercomm RUBIK Pi 3 has LUN 6 partitions backed by rubikpi_config.img, devcfg_full.img, rubikpi_dtso.img and splash.img. Without this whitelist entry these files are silently dropped from the bundle and the resulting flashable image is incomplete; this was previously being worked around in a downstream bbappend on core-image-base, which is the wrong layer. Add *.img to the find expression at the same precedence as the other plain extension globs. The change is purely additive: existing targets that do not deploy any *.img files into QCOM_BOOT_FILES_SUBDIR see no behavioural change, and the exclusions inside the \( ... \) ELF group are unaffected. Link: qualcomm-linux/meta-qcom-3rdparty#41 (comment) Signed-off-by: Tyler Baker <tyler.baker@oss.qualcomm.com>
EmbeddedAndroid
requested review from
anujm1,
koenkooi,
lumag,
ndechesne,
ricardosalveti,
sbanerjeeqc and
vkraleti
as code owners
Test Results 99 files ± 0 528 suites ±0 4h 56m 59s ⏱️ - 3h 9m 24s For more details on these failures, see this check. Results for commit 39762c0. ± Comparison against base commit a27cc18. This pull request removes 5 tests. |
lumag
approved these changes
May 13, 2026
|
we have seen failures Crashed Jobs: |
Contributor
Is it relevant to this pull request? |
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.
Summary
The boot-firmware deploy loop in
create_qcomflash_pkg(
classes-recipe/image_types_qcom.bbclass) globsQCOM_BOOT_FILES_SUBDIRfor a fixed set of file patterns (
*.elf,*.mbn*,*.melf*,*.fv,named
*.binfamilies, etc.) and copies the matches into the qcomflashtarball. Boards whose LUN payloads are deployed as raw
*.imgfilesare therefore silently dropped from the bundle, even though the
firmware recipe correctly deploys them into
QCOM_BOOT_FILES_SUBDIR.This trips up the Thundercomm RUBIK Pi 3 in particular, where LUN 6
holds
rubikpi_config.img,devcfg_full.img,rubikpi_dtso.imgandsplash.img. Future boards that ship raw image partitions will hitthe same gap.
Add
-o -name '*.img'to thefindexpression, at the same precedenceas the other plain extension globs. The
\( -name '*.elf' ! -name 'abl2esp*.elf' ... \)group with its exclusions is untouched.The change is purely additive. Targets that do not deploy any
*.imgfiles into
QCOM_BOOT_FILES_SUBDIRsee no behavioural change, noexisting pattern is removed, and no existing file is newly excluded.
This addresses review feedback on
qualcomm-linux/meta-qcom-3rdparty#41
(qualcomm-linux/meta-qcom-3rdparty#41 (comment))
requesting that the fix land here in
meta-qcomrather than as adownstream
core-image-basebbappend.