mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootimg/image-vm/image-live: Improve image dependencies

Browse Source 
Now that image generation consists of separate tasks, we can improve
the dependencies in these classes. We can also incorporate the tasks
within do_image_complete instead of do_build so we have a specific task
for when the deploy directory is populated with images.

This fixes various expectations about do_image_completed and the way
I'd tried to use it to fix some sanity test problems.

(From OE-Core rev: 9543c4a9ce0ac7d9ced66fa14e48a1aa7401011e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-01-18 14:27:02 +00:00
parent 0910bc65f5
commit ef211a5ca1
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/boot-directdisk.bbclass
View File

@@ -193,4 +193,4 @@ def validate_disk_signature(d):
DISK_SIGNATURE_GENERATED := "${@generate_disk_signature()}"
addtask bootdirectdisk before do_build
addtask bootdirectdisk before do_image_complete

2
meta/classes/bootimg.bbclass
View File

@@ -295,4 +295,4 @@ IMAGE_TYPEDEP_iso = "ext4"
IMAGE_TYPEDEP_hddimg = "ext4"
IMAGE_TYPES_MASKED += "iso hddimg"
addtask bootimg before do_build
addtask bootimg before do_image_complete

2
meta/classes/image-live.bbclass
View File

@@ -10,7 +10,7 @@ LABELS_append = " ${SYSLINUX_LABELS} "
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
do_bootimg[depends] += "${INITRD_IMAGE}:do_image_complete"
do_bootimg[depends] += "${PN}:do_image_complete"
do_bootimg[depends] += "${PN}:do_image_ext4"
inherit bootimg

4
meta/classes/image-vm.bbclass
View File

@@ -9,7 +9,7 @@ INITRD ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz' if '${INI
do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE}:do_image_complete' if '${INITRD_IMAGE}' else ''}"
# need to define the dependency and the ROOTFS for directdisk
do_bootdirectdisk[depends] += "${PN}:do_image_complete"
do_bootdirectdisk[depends] += "${PN}:do_image_ext4"
ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
# creating VM images relies on having a hddimg so ensure we inherit it here.
@@ -45,6 +45,6 @@ python do_vmimg() {
bb.build.exec_func('create_qcow2_image', d)
}
addtask vmimg after do_bootdirectdisk before do_build
addtask vmimg after do_bootdirectdisk before do_image_complete
do_vmimg[depends] += "qemu-native:do_populate_sysroot"