From f8992b8ede1f952aa813e7538ada5f6c098e53ef Mon Sep 17 00:00:00 2001
From: Martin Borg <martin.borg@enea.com>
Date: Wed, 28 Feb 2018 11:43:35 +0100
Subject: Remove build-qcow-image.inc

This functionality is available in upstream poky/rocko.

Signed-off-by: Martin Borg <martin.borg@enea.com>
---
 images/build-qcow-image.inc         | 16 ----------------
 images/enea-nfv-access-guest-dev.bb |  2 +-
 images/enea-nfv-access-guest.bb     |  2 +-
 images/enea-nfv-access-vnf.bb       |  3 +--
 4 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 images/build-qcow-image.inc

diff --git a/images/build-qcow-image.inc b/images/build-qcow-image.inc
deleted file mode 100644
index 1409edc..0000000
--- a/images/build-qcow-image.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-IMAGE_TYPES += "ext4.qcow2"
-CONVERSIONTYPES += "qcow2"
-CONVERSION_DEPENDS_qcow2 = "qemu-native"
-CONVERSION_CMD_qcow2 = "qemu-img convert -O qcow2 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.qcow2"
-
-IMAGE_FSTYPES += "ext4.qcow2"
-
-# To reduce storage size remove the intermediate images
-do_clean_unused_img() {
-    cd ${IMGDEPLOYDIR}
-    ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.qcow2 ${IMAGE_LINK_NAME}.qcow2
-    rm -f ${IMGDEPLOYDIR}/*.ext4
-    cd -
-}
-
-addtask clean_unused_img after do_image_ext4 before do_image_complete
diff --git a/images/enea-nfv-access-guest-dev.bb b/images/enea-nfv-access-guest-dev.bb
index 7e0d64b..471d316 100644
--- a/images/enea-nfv-access-guest-dev.bb
+++ b/images/enea-nfv-access-guest-dev.bb
@@ -10,4 +10,4 @@ IMAGE_INSTALL += " \
 
 IMAGE_FEATURES += "dbg-pkgs dev-pkgs"
 
-require images/build-qcow-image.inc
+IMAGE_FSTYPES += "ext4.qcow2"
diff --git a/images/enea-nfv-access-guest.bb b/images/enea-nfv-access-guest.bb
index 772c1d8..0359de4 100644
--- a/images/enea-nfv-access-guest.bb
+++ b/images/enea-nfv-access-guest.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL += " \
     packagegroup-enea-virtualization-guest \
     "
 
-require images/build-qcow-image.inc
+IMAGE_FSTYPES += "ext4.qcow2"
diff --git a/images/enea-nfv-access-vnf.bb b/images/enea-nfv-access-vnf.bb
index fdf7083..cb43bc3 100644
--- a/images/enea-nfv-access-vnf.bb
+++ b/images/enea-nfv-access-vnf.bb
@@ -7,8 +7,7 @@ ROOT_VM = "root=/dev/vda2"
 APPEND = "console=ttyS0,115200 hugepagesz=2M hugepages=512 isolcpus=1 nohz_full=1 rcu_nocbs=1 audit=0 quiet"
 SYSLINUX_TIMEOUT = "30"
 
-inherit image-vm
-IMAGE_FSTYPES += "qcow2"
+IMAGE_FSTYPES += "ext4.qcow2"
 
 CLOUDINITPKGS = "cloud-init util-linux-blkid"
 CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}"
-- 
cgit v1.2.3-54-g00ecf