Skip to content

Commit b49170f

Browse files
committed
image-types-qcom: correct dependency on boot firmware
IMAGE.do_image_qcomflash depends only on .do_rootfs, which in turn depends only on .do_package_foo tasks. It is possible, that firmware-qcom-boot-foo.do_deploy (which actually installs boot firmware into DEPLOY_DIR) is executed in parallel or afterwards, resulting in an incomplete qcomflash dir. Add direct dependency on the boot firmware packages in order to make sure that the qcomflash dir is complete. Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent a91a98a commit b49170f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

classes-recipe/image_types_qcom.bbclass

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ inherit image_types
55

66
IMAGE_TYPES += "qcomflash"
77

8+
QCOM_BOOT_FIRMWARE ?= ""
9+
810
QCOM_ESP_IMAGE ?= "esp-qcom-image"
911
QCOM_ESP_FILE ?= "${@'efi.bin' if d.getVar('QCOM_ESP_IMAGE') else ''}"
1012

@@ -30,6 +32,7 @@ IMAGE_CMD:qcomflash = "create_qcomflash_pkg"
3032
do_image_qcomflash[dirs] = "${QCOMFLASH_DIR}"
3133
do_image_qcomflash[cleandirs] = "${QCOMFLASH_DIR}"
3234
do_image_qcomflash[depends] += "${@ ['', '${QCOM_PARTITION_CONF}:do_deploy'][d.getVar('QCOM_PARTITION_CONF') != '']} \
35+
${@ ['', '${QCOM_BOOT_FIRMWARE}:do_deploy'][d.getVar('QCOM_BOOT_FIRMWARE') != '']} \
3336
virtual/kernel:do_deploy \
3437
${@'virtual/bootloader:do_deploy' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader') else ''} \
3538
${@'${QCOM_ESP_IMAGE}:do_image_complete' if d.getVar('QCOM_ESP_IMAGE') != '' else ''}"

0 commit comments

Comments
 (0)