[PATCH 3/5] wic-img: Require explicit setting of WKS_FILE

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

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

Do not default to some meta-isar file, that's both a laying violation
nor helpful once the user also need to specify the bootloader
dependencies for the imager.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/conf/multiconfig/qemuamd64-buster.conf  | 1 +
 meta-isar/conf/multiconfig/qemuamd64-stretch.conf | 1 +
 meta/classes/wic-img.bbclass                      | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
index 85404ae..8140d13 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
@@ -10,6 +10,7 @@ KERNEL_NAME ?= "amd64"
 IMAGE_PREINSTALL += "init"
 
 IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "sdimage-efi"
 
 ROOTFS_DEV ?= "sda2"
 
diff --git a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf
index 356d59b..0184617 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-stretch.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-stretch.conf
@@ -11,6 +11,7 @@ KERNEL_NAME ?= "amd64"
 IMAGE_PREINSTALL += "init"
 
 IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "sdimage-efi"
 
 ROOTFS_DEV ?= "sda2"
 
diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass
index bc405c1..167a54b 100644
--- a/meta/classes/wic-img.bbclass
+++ b/meta/classes/wic-img.bbclass
@@ -4,7 +4,11 @@
 # this class is heavily inspired by OEs ./meta/classes/image_types_wic.bbclass
 #
 
-WKS_FILE ?= "sdimage-efi"
+python () {
+    if not d.getVar('WKS_FILE', True):
+        bb.fatal("WKS_FILE must be set")
+}
+
 ROOTFS_TYPE ?= "ext4"
 
 STAGING_DATADIR ?= "/usr/lib/"
-- 
2.16.4