From patchwork Thu Oct 24 18:56:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Freihofer, Adrian" X-Patchwork-Id: 1183486 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::53d; helo=mail-ed1-x53d.google.com; envelope-from=swupdate+bncbaabb27hy7wqkgqet3viu3q@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=siemens.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="SqRBpjUR"; dkim-atps=neutral Received: from mail-ed1-x53d.google.com (mail-ed1-x53d.google.com [IPv6:2a00:1450:4864:20::53d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46zc0t2FsRz9sQn for ; Fri, 25 Oct 2019 05:56:46 +1100 (AEDT) Received: by mail-ed1-x53d.google.com with SMTP id y21sf16123165edr.18 for ; Thu, 24 Oct 2019 11:56:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1571943403; cv=pass; d=google.com; s=arc-20160816; b=CIFBTLHivwLN6Z4lz0AvOW8qthJd2NfhmEJxF/6Q1Q2wWeJu1NfwOM7XZXLkjmKyQS ZGyOE2XTLi42h5Xz9BFIqUTpUIyXSJ0toM06rPeW3dsh6oXW0QsqIGf09YsqvOflpNVP sY68DAriGzffNOE/p2yGZj1LxB/psML3Ece5dBWB/EBCBZjQatTXQ6I/aGVG4x5eq6Z6 wWws/YyMSTPFnd0MqBx9eJD+V59VWZhPhmgL4S9h071mRk18T4BxCaGgA5ysjZ72OE9s 9SGoe5Gw9qMSzJXQ/Sq8VRxCC31bfPWDMtPKC0IphvZ2TO7xv0uw3Rt6z2VTGhj8zayr zZeA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:mime-version:sender:dkim-signature; bh=pqJHC2AYd4PBDlCFwSxoSgPLaBFgpspZhCaAJypSpPA=; b=bTCAKADZMNP0BeA/YPPJGJXwClnZmVEa/s3z4T4plkjCMCP19VZAqdmpr+vBbS6S9w 4HQi7eiSAwHc/lEjuObeIn0lYMhPVR6I1zpfBPl6jtZqMeB4x90HMMfBHt6tnu8q/p89 wgJp5h4d7JQNHgKP+EbTGW+AA+KnONmx4gCqAqanPxKCJtpdTpcXAVbaKqhnHlohzChu M7n2H1TXxHu1vEZIuwFditAfRAQw41hH9axSHOPYDMvN54ogy0KXzBbLLD7hfpsGguI9 6mU/oCmsODeHNAHUd7RJ0d1tBu7WPV06vZy7kJCSqucGsMo2aq36etU9wMpAFjtukg+N gBJA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=pqJHC2AYd4PBDlCFwSxoSgPLaBFgpspZhCaAJypSpPA=; b=SqRBpjUR0/3yxG4xb5zvsDCWuoMIzPCNSnKZMEx04axBQG/cAgZU+7N34FNNVtBZy3 IMdJhjIukLL0caIk5+HzO0m/t3Vgt6vdDc0sjocUYid1mdNbWmgZz8MpgiI1WPaO1RYV 6elWgOqw1vqRMR3I85u4o2V0fpmCEd0pNRaCiXyb01u0fzdPAGW7Kq6XqI3F2p3OGEzE UhmmzRajnxujW+2GwdoY0B0f3rK94xifEltSBW7niZd4yzphDNRnxS8yJLQD6o51oOrt Pbcu9LHXI9Nvhl5oR0zfzdkxCbcm4wqXGk5UVFGXD8iOSpG+cpjeAG8j+0kleXSHmcpE 7iDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=pqJHC2AYd4PBDlCFwSxoSgPLaBFgpspZhCaAJypSpPA=; b=JRewtg26plLGqlNGVTWMU1TzfAMFMy9D/bNctgq4vj8Bo6/lQwre0fRdTTz4zWAK6c QxPOhPCtrTRMTp4KgUFCr6HTHKYm7uM1pxkUg3zWb9oSatRlpx8h/VuiBimihPjbGFrX GelKBTmb1v8b9M+5g883pYjTnkdRZEyg/4fUsaFe6n6AaG/2X70wg35Uq0UfZG2Ls3qX c1eYM82RFCvq4Kq0GM14JHTMFCTV5k9aHiLhu4OlYKnZxa5cNGsMC9/tjeVMi+tgrBsk Rwacksm4gLX6FkcZDfN3PvjA9/oD0H8uJCQGhwFhLKgR9nfQORou25h8BePuXbrOf5n4 Knzg== Sender: swupdate@googlegroups.com X-Gm-Message-State: APjAAAVUpwyVnNpoROZrD7SbZfU+TqcOuWk1g5K9MRKCw0y44HXcPVjv K4Nvc4OdfDyHN7QAA0JN4Es= X-Google-Smtp-Source: APXvYqxHJkzgtFQA/oxNMw/L2z2JXzrvcsalCwaCaOLost1WQ6tzNHWq8yMZqorw4e6Vaci2/HmKkQ== X-Received: by 2002:a50:ec03:: with SMTP id g3mr11806841edr.83.1571943403159; Thu, 24 Oct 2019 11:56:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:906:4ccb:: with SMTP id q11ls1543025ejt.4.gmail; Thu, 24 Oct 2019 11:56:42 -0700 (PDT) X-Received: by 2002:a17:906:4a15:: with SMTP id w21mr23468458eju.294.1571943402799; Thu, 24 Oct 2019 11:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571943402; cv=none; d=google.com; s=arc-20160816; b=rQEkTXgLvMhBo+kL+7d0lOIawChoA/HvM1dhLUMx/uHce1o+pQgSIUjpNNeiTpLR2m TVnheOzr4YfipkjrC0IXHh5TGrQYQfuYlw+zbDFJ9McKcRFgXYrdtrylgZM3p4L4vi3l nRsBrdn1xr6USX33M1x1wZe23G4yTXAjPP3AuAdkjoACbqLzmEvJGT2KNKrTm5ZaZIzF rMzktRTV4GNLTIQ7qLVPPHne7vjrMDh6gr5sEyv4zasoHtz/NB074mf3ajiD+8IbfBHL S/2TH0NtDGXqJTnQ3nPTDGXVxL7/n+zC0p+wnuZk3kZ951thK/KNfxdAR/eDn+Wuyo1t ZD9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=C1qQYF30ixLFhbDYuVXryxNPk9hI1x+XrxvpxN/o4dk=; b=y1iG1BuoegRSzK/mp+3vxtEq98LoerBxAf6lN57tulMSeysYe+3/wX6YLoQlBLW9yu ieqyWUgB7fG/+n35W18KRrs4eLCwoF7zEanwpHSJeFgXPrlYr4nxpUmNZR077Tlq6FE0 Mnwxh34Dzpbp7Ud/FHcVzDmp8bKWoBakiBeHavIRfNNbEmDezNPednQ8agTBC4DegpPq MXmsMA7jFwvYusR9jL832OgDwqTvgWo2SHqVKe5KIXnxrmxeYdrrxW+qmn0flf/Xx1TS Kb5N6Wu5FmX6Bf85p/JG232Vmr2tOEuGstq7L/AC6Wxc1Yucb3rosCW667/bXRWb7dNc f3sw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id q17si842812edi.1.2019.10.24.11.56.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 11:56:42 -0700 (PDT) Received-SPF: pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x9OIugDr002214 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 24 Oct 2019 20:56:42 +0200 Received: from dev.vm6.ccp.siemens.com ([139.22.33.162]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id x9OIue14030454; Thu, 24 Oct 2019 20:56:40 +0200 Received: from dev.localdomain (localhost [127.0.0.1]) by dev.vm6.ccp.siemens.com (Postfix) with ESMTP id 5CC002353A54; Thu, 24 Oct 2019 20:56:40 +0200 (CEST) From: Adrian Freihofer To: swupdate@googlegroups.com Cc: Adrian Freihofer Subject: [swupdate] [meta-swupdate][PATCH v2 03/12] swupdate: support signed image with variable name Date: Thu, 24 Oct 2019 20:56:26 +0200 Message-Id: <20191024185635.31754-4-adrian.freihofer@siemens.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191024185635.31754-1-adrian.freihofer@siemens.com> References: <20191024185635.31754-1-adrian.freihofer@siemens.com> X-Original-Sender: adrian.freihofer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of adrian.freihofer@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=adrian.freihofer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Support the following in a sw-description: filename = "@@ROOTFS_IMAGE@@"; sha256 = "@@@ROOTFS_IMAGE@@"; First the @@ROOTFS_IMAGE@@ gets replaced e.g. by @my-image. Second @my-image gets replaced by the sha256 hash. Signed-off-by: Adrian Freihofer --- classes/swupdate-common.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index c0b302a..38f1906 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -37,22 +37,22 @@ def swupdate_expand_bitbake_variables(d, s): for line in f: found = False while True: - m = re.match(r"^(?P.+)@@(?P\w+)@@(?P.+)$", line) + m = re.match(r"^(?P.+)@@(?P@?)(?P\w+)@@(?P.+)$", line) if m: bitbake_variable_value = d.getVar(m.group('bitbake_variable_name'), True) if bitbake_variable_value is None: bitbake_variable_value = "" bb.warn("BitBake variable %s not set" % (m.group('bitbake_variable_name'))) - line = m.group('before_placeholder') + bitbake_variable_value + m.group('after_placeholder') + line = m.group('before_placeholder') + m.group('sign_at') + bitbake_variable_value + m.group('after_placeholder') found = True continue else: - m = re.match(r"^(?P.+)@@(?P.+)\[(?P.+)\]@@(?P.+)$", line) + m = re.match(r"^(?P.+)(?P@?)@@(?P.+)\[(?P.+)\]@@(?P.+)$", line) if m: bitbake_variable_value = (d.getVarFlag(m.group('bitbake_variable_name'), m.group('flag_var_name'), True) or "") if bitbake_variable_value is None: bitbake_variable_value = "" - line = m.group('before_placeholder') + bitbake_variable_value + m.group('after_placeholder') + line = m.group('before_placeholder') + m.group('sign_at') + bitbake_variable_value + m.group('after_placeholder') continue if found: