summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorMartin Borg <martin.borg@enea.com>2018-02-28 11:43:35 +0100
committerMartin Borg <martin.borg@enea.com>2018-02-28 11:43:35 +0100
commitf8992b8ede1f952aa813e7538ada5f6c098e53ef (patch)
treebed9dd5b79fad7600b2111a68e70dbd446767383 /images
parenta0a9b1621fd396414c70b51a0e9bfc7c55ddf3a4 (diff)
downloadmeta-el-nfv-access-f8992b8ede1f952aa813e7538ada5f6c098e53ef.tar.gz
Remove build-qcow-image.inc
This functionality is available in upstream poky/rocko. Signed-off-by: Martin Borg <martin.borg@enea.com>
Diffstat (limited to 'images')
-rw-r--r--images/build-qcow-image.inc16
-rw-r--r--images/enea-nfv-access-guest-dev.bb2
-rw-r--r--images/enea-nfv-access-guest.bb2
-rw-r--r--images/enea-nfv-access-vnf.bb3
4 files changed, 3 insertions, 20 deletions
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 @@
1IMAGE_TYPES += "ext4.qcow2"
2CONVERSIONTYPES += "qcow2"
3CONVERSION_DEPENDS_qcow2 = "qemu-native"
4CONVERSION_CMD_qcow2 = "qemu-img convert -O qcow2 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.qcow2"
5
6IMAGE_FSTYPES += "ext4.qcow2"
7
8# To reduce storage size remove the intermediate images
9do_clean_unused_img() {
10 cd ${IMGDEPLOYDIR}
11 ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.qcow2 ${IMAGE_LINK_NAME}.qcow2
12 rm -f ${IMGDEPLOYDIR}/*.ext4
13 cd -
14}
15
16addtask 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 += " \
10 10
11IMAGE_FEATURES += "dbg-pkgs dev-pkgs" 11IMAGE_FEATURES += "dbg-pkgs dev-pkgs"
12 12
13require images/build-qcow-image.inc 13IMAGE_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 += " \
6 packagegroup-enea-virtualization-guest \ 6 packagegroup-enea-virtualization-guest \
7 " 7 "
8 8
9require images/build-qcow-image.inc 9IMAGE_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"
7APPEND = "console=ttyS0,115200 hugepagesz=2M hugepages=512 isolcpus=1 nohz_full=1 rcu_nocbs=1 audit=0 quiet" 7APPEND = "console=ttyS0,115200 hugepagesz=2M hugepages=512 isolcpus=1 nohz_full=1 rcu_nocbs=1 audit=0 quiet"
8SYSLINUX_TIMEOUT = "30" 8SYSLINUX_TIMEOUT = "30"
9 9
10inherit image-vm 10IMAGE_FSTYPES += "ext4.qcow2"
11IMAGE_FSTYPES += "qcow2"
12 11
13CLOUDINITPKGS = "cloud-init util-linux-blkid" 12CLOUDINITPKGS = "cloud-init util-linux-blkid"
14CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}" 13CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}"