[PATCH v3] meta/classes:Add wic tooling for related images

[Quirin Gylstorff <quirin.gylstorff@siemens.com>]

The dependencies for wic are only added if IMAGE_TYPE
is equal to "wic-img". If a image type depends on the
wic-image class it is no longer possible to build a
wic image.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
Changes in v3:
 - remove empty lines
Changes in v2:
 - move below inherit buildchroot

 meta/classes/image-tools-extension.bbclass | 6 ------
 meta/classes/wic-img.bbclass               | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass
index b8672d5..ca94d49 100644
--- a/meta/classes/image-tools-extension.bbclass
+++ b/meta/classes/image-tools-extension.bbclass
@@ -14,12 +14,6 @@ IMAGER_INSTALL ??= ""
 IMAGER_BUILD_DEPS ??= ""
 DEPENDS += "${IMAGER_BUILD_DEPS}"
 
-python () {
-    if d.getVar('IMAGE_TYPE', True) == 'wic-img':
-        d.appendVar('IMAGER_INSTALL',
-                    ' ' + d.getVar('WIC_IMAGER_INSTALL', True))
-}
-
 do_install_imager_deps[depends] = "buildchroot-target:do_build"
 do_install_imager_deps[deptask] = "do_deploy_deb"
 do_install_imager_deps[lockfiles] += "${REPO_ISAR_DIR}/isar.lock"
diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index 94f0b02..1ccbe55 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -78,6 +78,7 @@ python () {
 
 inherit buildchroot
 
+IMAGER_INSTALL += "${WIC_IMAGER_INSTALL}"
 # wic comes with reasonable defaults, and the proper interface is the wks file
 ROOTFS_EXTRA ?= "0"
 
-- 
2.20.1