diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 14:27:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-19 16:35:37 +0000 |
| commit | 9543c4a9ce0ac7d9ced66fa14e48a1aa7401011e (patch) | |
| tree | c0fbbf9ff241ccd3640e5610350d469250c12818 | |
| parent | b2576f2eab10e4c5dd86449312b417a269cc578e (diff) | |
| download | openembedded-core-contrib-9543c4a9ce0ac7d9ced66fa14e48a1aa7401011e.tar.gz | |
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>
| -rw-r--r-- | meta/classes/boot-directdisk.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/bootimg.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/image-live.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/image-vm.bbclass | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index b324d89020..ee8c74438c 100644 --- 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 ed9afb92f6..b174266131 100644 --- 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 d2e8b85482..aafa7d5b23 100644 --- 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 d214bf8862..6f3a55b263 100644 --- 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" |