diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-06 22:57:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:26:29 +0000 |
commit | 3341f3fbee818a0bd62620b8bc34230b03c0689c (patch) | |
tree | 40b07685cb19f5afb62066f837689d24e55cfbce /meta/classes/image-vm.bbclass | |
parent | 0a4e1f968ada5099e3270ed06404d2827e9729aa (diff) | |
download | poky-3341f3fbee818a0bd62620b8bc34230b03c0689c.tar.gz |
classes: Fix do_rootfs references
After the separation of do_rootfs, some rootfs references need changing
to image_complete.
(From OE-Core rev: 59a5f596ca29b1eb8283706e3c60fbb39f9c2c23)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image-vm.bbclass')
-rw-r--r-- | meta/classes/image-vm.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index 575a4b7ffe..d214bf8862 100644 --- a/meta/classes/image-vm.bbclass +++ b/meta/classes/image-vm.bbclass | |||
@@ -6,10 +6,10 @@ LABELS_append = " ${SYSLINUX_LABELS} " | |||
6 | # Using an initramfs is optional. Enable it by setting INITRD_IMAGE. | 6 | # Using an initramfs is optional. Enable it by setting INITRD_IMAGE. |
7 | INITRD_IMAGE ?= "" | 7 | INITRD_IMAGE ?= "" |
8 | INITRD ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE}' else ''}" | 8 | INITRD ?= "${@'${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE}' else ''}" |
9 | do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE}:do_rootfs' if '${INITRD_IMAGE}' else ''}" | 9 | do_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 |
12 | do_bootdirectdisk[depends] += "${PN}:do_rootfs" | 12 | do_bootdirectdisk[depends] += "${PN}:do_image_complete" |
13 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.ext4" | 13 | ROOTFS ?= "${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. |