mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
Fix do_image_rpi_sdimg/do_image_wic dependencies
The dependency resolution code in bitbake has recently been optimized and this seems to have slightly changed the behaviour of do_image_rpi_sdimg and do_image_wic. We ensure that the main build artifacts are present by depending on the relevant do_deploy and do_populate_sysroot tasks. However, we need to ensure that other build tasks for these dependencies have also been executed before we try to create our image. This can be achieved by adding a recursive dependency on do_build, so that the do_build tasks of all recipes in the dependency chain of do_image_rpi_sdimg/do_image_wic are executed before the image function itself is executed. The original issue seen here was that 'recipedata' files were not copied to 'tmp/deploy/licenses' as do_populate_lic for each dependency had not been ran before the image creation function. The write_deploy_manifest function from license.bbclass (listed in IMAGE_POSTPROCESS_COMMAND) therefore failed. Adding the recursive dependency on do_build fixes this issue, ensuring do_populate_lic runs before do_image_rpi_sdimg/do_image_wic. Signed-off-by: Paul Barker <pbarker@toganlabs.com>
This commit is contained in:
parent
72bc798ff5
commit
6d0830b26f
|
@ -58,6 +58,8 @@ do_image_rpi_sdimg[depends] = " \
|
|||
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
|
||||
"
|
||||
|
||||
do_image_rpi_sdimg[recrdeps] = "do_build"
|
||||
|
||||
# SD card image name
|
||||
SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg"
|
||||
|
||||
|
|
|
@ -104,6 +104,8 @@ do_image_wic[depends] += " \
|
|||
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
|
||||
"
|
||||
|
||||
do_image_wic[recrdeps] = "do_build"
|
||||
|
||||
# The kernel image is installed into the FAT32 boot partition and does not need
|
||||
# to also be installed into the rootfs.
|
||||
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
|
||||
|
|
Loading…
Reference in New Issue
Block a user