[PATCH 13/16] image: Limit ROOTFS_EXTRA to non-wic image type

[Jan Kiszka <jan.kiszka@siemens.com>]

From: Jan Kiszka <jan.kiszka@siemens.com>

wic does its own extra-space / overhead-factor management, and the
proper interface for that is the wks file. However, keep the
ROOTFS_EXTRA for other image types.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/image.bbclass   | 12 ++++++------
 meta/classes/wic-img.bbclass |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index c251477..3f00806 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -7,6 +7,12 @@ IMAGE_ROOTFS   = "${WORKDIR}/rootfs"
 
 IMAGE_INSTALL += "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}"
 
+# These variables are used by wic and start_vm
+KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}"
+INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}"
+
+inherit ${IMAGE_TYPE}
+
 # Extra space for rootfs in MB
 ROOTFS_EXTRA ?= "64"
 
@@ -57,12 +63,6 @@ python set_image_size () {
     d.setVarFlag('ROOTFS_SIZE', 'export', '1')
 }
 
-# These variables are used by wic and start_vm
-KERNEL_IMAGE ?= "${@get_image_name(d, 'vmlinuz')[1]}"
-INITRD_IMAGE ?= "${@get_image_name(d, 'initrd.img')[1]}"
-
-inherit ${IMAGE_TYPE}
-
 do_rootfs[stamp-extra-info] = "${MACHINE}-${DISTRO}"
 do_rootfs[depends] = "isar-apt:do_cache_config isar-bootstrap-target:do_bootstrap"
 
diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index 475326d..3ac613c 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -9,6 +9,9 @@ python () {
         bb.fatal("WKS_FILE must be set")
 }
 
+# wic comes with reasonable defaults, and the proper interface is the wks file
+ROOTFS_EXTRA ?= "0"
+
 STAGING_DATADIR ?= "/usr/lib/"
 STAGING_LIBDIR ?= "/usr/lib/"
 STAGING_DIR ?= "${TMPDIR}"
-- 
2.16.4