From patchwork Thu May 27 13:17:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gylstorff Quirin X-Patchwork-Id: 12284243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4F62C4708A for ; Thu, 27 May 2021 13:25:03 +0000 (UTC) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8211E613EB for ; Thu, 27 May 2021 13:25:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8211E613EB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6475+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id SXqlYY4521723x0lsPwaWUcN; Thu, 27 May 2021 06:25:03 -0700 X-Received: from gecko.sbs.de (gecko.sbs.de [194.138.37.40]) by mx.groups.io with SMTP id smtpd.web12.6740.1622121902115508495 for ; Thu, 27 May 2021 06:25:02 -0700 X-Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 14RDOwZl027002 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 27 May 2021 15:24:58 +0200 X-Received: from md2dvrtc.fritz.box ([167.87.10.167]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 14RDHgax007209; Thu, 27 May 2021 15:17:43 +0200 From: "Quirin Gylstorff" To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org Cc: Quirin Gylstorff Subject: [cip-dev][isar-cip-core][PATCH 2/5] kas/opt: Allow override of WKS_FILE in swupdate option Date: Thu, 27 May 2021 15:17:38 +0200 Message-Id: <20210527131741.8828-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20210527131741.8828-1-Quirin.Gylstorff@siemens.com> References: <20210527131741.8828-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: cip-dev@lists.cip-project.org List-Id: Mailing-List: list cip-dev@lists.cip-project.org; contact cip-dev+owner@lists.cip-project.org Reply-To: cip-dev@lists.cip-project.org X-Gm-Message-State: 6kJ2tSzuxgJHGJFN4OpRjqkax4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1622121903; bh=aU2fQLsVZizy4VI1/RoRf/d6xXTNn6CR25ykeZFToKk=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=Y+3pgL8pyAUoKKGr+e59tyqFN4W5dNGZQU3mKDZ/oNnNrZ0EancD0gRJX8WohcwJgBU J+lh2ypcGR/VUE13LfWPRzLQI0IYUe/XviCBR5W5TVHWulG330zROQv6Z1JSWED/w9ZIW cEXXpJGEauqcmDhh/OAxl/xg+foE80UBOyo= From: Quirin Gylstorff This fixes an error if swupdate.yml is used together with the secureboot options. Signed-off-by: Quirin Gylstorff --- kas/opt/efibootguard.yml | 2 ++ kas/opt/swupdate.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml index 544c740..d5a0e39 100644 --- a/kas/opt/efibootguard.yml +++ b/kas/opt/efibootguard.yml @@ -23,4 +23,6 @@ local_conf_header: efibootguard-wic: | WDOG_TIMEOUT = "0" WICVARS += "WDOG_TIMEOUT" + IMAGE_TYPE ?= "wic-img" + WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index e622972..bd0f6e4 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml @@ -19,5 +19,5 @@ local_conf_header: IMAGE_INSTALL_append = " swupdate" wic-swu: | - IMAGE_TYPE ?= "wic-swu-img" - WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks" + IMAGE_TYPE = "wic-swu-img" + WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"