summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 14:27:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-19 17:24:47 +0000
commitef211a5ca1e39d1111b21ab3a4218c254dd8dc41 (patch)
tree85b0a6fbd996de9f5a830fb928291550055c21f2
parent0910bc65f57e87dc36202b914e712db873f7c19b (diff)
downloadpoky-ef211a5ca1e39d1111b21ab3a4218c254dd8dc41.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. (From OE-Core rev: 9543c4a9ce0ac7d9ced66fa14e48a1aa7401011e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/boot-directdisk.bbclass2
-rw-r--r--meta/classes/bootimg.bbclass2
-rw-r--r--meta/classes/image-live.bbclass2
-rw-r--r--meta/classes/image-vm.bbclass4
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):
193 193
194DISK_SIGNATURE_GENERATED := "${@generate_disk_signature()}" 194DISK_SIGNATURE_GENERATED := "${@generate_disk_signature()}"
195 195
196addtask bootdirectdisk before do_build 196addtask 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"
295IMAGE_TYPEDEP_hddimg = "ext4" 295IMAGE_TYPEDEP_hddimg = "ext4"
296IMAGE_TYPES_MASKED += "iso hddimg" 296IMAGE_TYPES_MASKED += "iso hddimg"
297 297
298addtask bootimg before do_build 298addtask 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} "
10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" 10ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
11 11
12do_bootimg[depends] += "${INITRD_IMAGE}:do_image_complete" 12do_bootimg[depends] += "${INITRD_IMAGE}:do_image_complete"
13do_bootimg[depends] += "${PN}:do_image_complete" 13do_bootimg[depends] += "${PN}:do_image_ext4"
14 14
15inherit bootimg 15inherit bootimg
16 16
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
9do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE}:do_image_complete' if '${INITRD_IMAGE}' else ''}" 9do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE}:do_image_complete' if '${INITRD_IMAGE}' else ''}"
10 10
11# need to define the dependency and the ROOTFS for directdisk 11# need to define the dependency and the ROOTFS for directdisk
12do_bootdirectdisk[depends] += "${PN}:do_image_complete" 12do_bootdirectdisk[depends] += "${PN}:do_image_ext4"
13ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" 13ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4"
14 14
15# creating VM images relies on having a hddimg so ensure we inherit it here. 15# creating VM images relies on having a hddimg so ensure we inherit it here.
@@ -45,6 +45,6 @@ python do_vmimg() {
45 bb.build.exec_func('create_qcow2_image', d) 45 bb.build.exec_func('create_qcow2_image', d)
46} 46}
47 47
48addtask vmimg after do_bootdirectdisk before do_build 48addtask vmimg after do_bootdirectdisk before do_image_complete
49do_vmimg[depends] += "qemu-native:do_populate_sysroot" 49do_vmimg[depends] += "qemu-native:do_populate_sysroot"
50 50