[PATCH 7/7] meta: Fold wks-file class into wic-img

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

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

There is no longer a valid use case for obtaining a wks file outside of
the wic-img class.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/wic-img.bbclass  | 26 ++++++++++++++++++++++----
 meta/classes/wks-file.bbclass | 30 ------------------------------
 2 files changed, 22 insertions(+), 34 deletions(-)
 delete mode 100644 meta/classes/wks-file.bbclass

diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index e7527c8..225463e 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -5,14 +5,32 @@
 #
 
 python () {
-    if not d.getVar('WKS_FILE', True):
+    wks_full_path = None
+
+    wks_file = d.getVar('WKS_FILE', True)
+    if not wks_file:
         bb.fatal("WKS_FILE must be set")
+    if not wks_file.endswith('.wks'):
+        wks_file += '.wks'
+
+    if os.path.isabs(wks_file):
+        if os.path.exists(wks_file):
+            wks_full_path = wks_file
+    else:
+        bbpaths = d.getVar('BBPATH', True).split(':')
+        corebase = d.getVar('COREBASE', True)
+        search_path = ':'.join('%s/wic' % p for p in bbpaths) + ':' + \
+            ':'.join('%s/scripts/lib/wic/canned-wks' % l \
+                     for l in (bbpaths + [corebase]))
+        wks_full_path = bb.utils.which(search_path, wks_file)
+
+    if not wks_full_path:
+        bb.fatal("WKS_FILE '%s' not found" % wks_file)
+
+    d.setVar('WKS_FULL_PATH', wks_full_path)
 }
 
 inherit buildchroot
-inherit wks-file
-
-WKS_FULL_PATH = "${@get_wks_full_path(d)}"
 
 # wic comes with reasonable defaults, and the proper interface is the wks file
 ROOTFS_EXTRA ?= "0"
diff --git a/meta/classes/wks-file.bbclass b/meta/classes/wks-file.bbclass
deleted file mode 100644
index 493fea7..0000000
--- a/meta/classes/wks-file.bbclass
+++ /dev/null
@@ -1,30 +0,0 @@
-# This software is a part of ISAR.
-# Copyright (C) 2018 Siemens AG
-#
-# SPDX-License-Identifier: MIT
-
-def get_wks_full_path(d):
-    if (d.getVar('IMAGE_TYPE', True) or '') != 'wic-img':
-        return ""
-
-    wks_full_path = None
-
-    wks_file = d.getVar('WKS_FILE', True)
-    if not wks_file.endswith('.wks'):
-        wks_file += '.wks'
-
-    if os.path.isabs(wks_file):
-        if os.path.exists(wks_file):
-            wks_full_path = wks_file
-    else:
-        bbpaths = d.getVar('BBPATH', True).split(':')
-        corebase = d.getVar('COREBASE', True)
-        search_path = ':'.join('%s/wic' % p for p in bbpaths) + ':' + \
-            ':'.join('%s/scripts/lib/wic/canned-wks' % l \
-                     for l in (bbpaths + [corebase]))
-        wks_full_path = bb.utils.which(search_path, wks_file)
-
-    if not wks_full_path:
-        bb.fatal("WKS_FILE '%s' not found" % wks_file)
-
-    return wks_full_path
-- 
2.16.4