[PATCH] 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>
---
 meta/classes/image-tools-extension.bbclass | 6 ------
 meta/classes/wic-img.bbclass               | 4 ++++
 2 files changed, 4 insertions(+), 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..eee27b3 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -11,6 +11,10 @@ do_copy_wks_template () {
     cp -f '${WKS_TEMPLATE_PATH}' '${WORKDIR}/${WKS_TEMPLATE_FILE}'
 }
 
+
+IMAGER_INSTALL = ${WIC_IMAGER_INSTALL}
+
+
 python () {
     import itertools
     import re
-- 
2.20.1