From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6597806297219858432 X-Received: by 2002:a19:1a09:: with SMTP id a9-v6mr949192lfa.1.1536171486830; Wed, 05 Sep 2018 11:18:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3308:: with SMTP id d8-v6ls287395ljc.11.gmail; Wed, 05 Sep 2018 11:18:06 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbZAoRNMbhygSdRwkWbeCcW0GZjmGjFK6LAJ6SBf8YWSjU9fGS0fHrm0UM39pvfiknHgbq9 X-Received: by 2002:a2e:654a:: with SMTP id z71-v6mr1581529ljb.30.1536171486190; Wed, 05 Sep 2018 11:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536171486; cv=none; d=google.com; s=arc-20160816; b=GtrdFE214GzqlDgOM4bj300pY+kEnY9N9B6jqLXomAAjWESaPcrlC5T+Wy+1qKumtv YBv6XN35kGawSR45M2CkZoRka/2fS4cX8PxjeXtrzq6KnHPRwSFTg7SJqGjhBmgdbrwB 1MsCF+ozzSQlvzJspSwhidzRQOLHm4WKGRROCTfSlpfXEkpD6N5Az6j5xONGIQ3FPPWU QTS0hF5adnNgyCYt+l3ay5NJUgBk16L+QUelZjisfAz5OHjOmg50ghmO1LDqWWuwZFbT 1WNo4mp3bbJFZ5pihEIgDoxxtCxbmTn899sVO8qT9AGZJRkvbQ+redd1I0O80Dj7HRl5 5XKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=yTThIYk1kLn+NFgVJdP+I7v1Szdsu77pIaFd/N+ZKiU=; b=XMstfOZT/WKh+HHpyzaOp8PUFn+g2nwJsz6I+3cPDzYVNV8NSD4pj8u8s7abCpenXu 5I+B8VY0mViSpKpjzyw8GNQ281UzkfpcSGdXe2J5rQ8RXC4JlR59u66iobFnQb0RYuqJ h77c7ce6O1T4JKags2K2JLc1GjAlum81ILJ0um5R0Q0oZkSAdJo0bDRIcSY3tz3rABIE ZWYf4M/qBK0A/CNLzJ4cWrWEtHR/LwtBCafAwi4U2+HkSXzIznQBvDGOh6dtJ4d1SsJM E00At5y3YMMksdb1UAF7pIFTkw9qju7FWvM5U6KBFCnjYyiK8xBLFFgZhi/cVOczga8Q eAhQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id i67-v6si87590lfb.3.2018.09.05.11.18.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Sep 2018 11:18:06 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id w85II5dB015083 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 5 Sep 2018 20:18:05 +0200 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w85II4cr028591 for ; Wed, 5 Sep 2018 20:18:05 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 3/5] wic-img: Require explicit setting of WKS_FILE Date: Wed, 5 Sep 2018 20:18:02 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 1XOx5CA6D2hJ From: Jan Kiszka 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 --- 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