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

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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index b324d890203ae5d4a87035f9fe13db2c35769286..ee8c74438cf42bbd4c4eb27e375ea15c73d6ad5d 100644 (file)
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -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

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index ed9afb92f63f5eb640e3216f5bb0370b773760dc..b17426613121511e701c5123c363fb6ace557482 100644 (file)
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -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

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index d2e8b854827e350badca92922b3cca9d15dac2c8..aafa7d5b2316b807038c2b4157481712b1b75342 100644 (file)
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -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
 

diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index d214bf8862bdf1767a75f0bc31a204e431786351..6f3a55b263258eca973f11bb5594ef5c5409ba3a 100644 (file)
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -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"