summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-07-31 19:22:51 -0700
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-08-03 23:47:07 -0400
commit0a64d42d45e26dab283450a83ecdc50bd8821dcd (patch)
treed164a5ca8aac0f0f7dd710ee95ed6036bb27a598
parent87b4527787559e02bf22f1dabc7cc1da17934d9f (diff)
downloadmeta-virtualization-0a64d42d45e26dab283450a83ecdc50bd8821dcd.tar.gz
cloud-image-guest/controller: remove inherit image-vm
The image-vm.bbclass had been removed by oe-core, and vmdk is replaced by wic.vmdk. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-extended/images/cloud-image-controller.bb3
-rw-r--r--recipes-extended/images/cloud-image-guest.bb3
2 files changed, 2 insertions, 4 deletions
diff --git a/recipes-extended/images/cloud-image-controller.bb b/recipes-extended/images/cloud-image-controller.bb
index 0b2a67b5..5eef3021 100644
--- a/recipes-extended/images/cloud-image-controller.bb
+++ b/recipes-extended/images/cloud-image-controller.bb
@@ -26,9 +26,8 @@ IMAGE_INSTALL = "\
26 " 26 "
27 27
28inherit core-image 28inherit core-image
29inherit image-vm
30 29
31IMAGE_FSTYPES = "vmdk tar.gz" 30IMAGE_FSTYPES = "wic.vmdk tar.gz"
32 31
33# Ensure extra space for guest images 32# Ensure extra space for guest images
34#IMAGE_ROOTFS_EXTRA_SPACE = "41943040" 33#IMAGE_ROOTFS_EXTRA_SPACE = "41943040"
diff --git a/recipes-extended/images/cloud-image-guest.bb b/recipes-extended/images/cloud-image-guest.bb
index e24bf0d4..5db25f01 100644
--- a/recipes-extended/images/cloud-image-guest.bb
+++ b/recipes-extended/images/cloud-image-guest.bb
@@ -13,6 +13,5 @@ IMAGE_INSTALL = "\
13 " 13 "
14 14
15inherit core-image 15inherit core-image
16inherit image-vm
17 16
18IMAGE_FSTYPES += "vmdk" 17IMAGE_FSTYPES += "wic.vmdk"