From 0a64d42d45e26dab283450a83ecdc50bd8821dcd Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 31 Jul 2017 19:22:51 -0700 Subject: 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 Signed-off-by: Bruce Ashfield --- recipes-extended/images/cloud-image-controller.bb | 3 +-- recipes-extended/images/cloud-image-guest.bb | 3 +-- 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 = "\ " inherit core-image -inherit image-vm -IMAGE_FSTYPES = "vmdk tar.gz" +IMAGE_FSTYPES = "wic.vmdk tar.gz" # Ensure extra space for guest images #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 = "\ " inherit core-image -inherit image-vm -IMAGE_FSTYPES += "vmdk" +IMAGE_FSTYPES += "wic.vmdk" -- cgit v1.2.3-54-g00ecf