From patchwork Thu Aug 3 13:16:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marko, Peter" X-Patchwork-Id: 1816440 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33a; helo=mail-wm1-x33a.google.com; envelope-from=swupdate+bncbaabbdwsv2tamgqerrx4zwi@googlegroups.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20221208 header.b=C3XTLqb1; dkim-atps=neutral Received: from mail-wm1-x33a.google.com (mail-wm1-x33a.google.com [IPv6:2a00:1450:4864:20::33a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RGqCk6SGtz1yYC for ; Thu, 3 Aug 2023 23:18:10 +1000 (AEST) Received: by mail-wm1-x33a.google.com with SMTP id 5b1f17b1804b1-3fe12bf2db4sf2463735e9.0 for ; Thu, 03 Aug 2023 06:18:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1691068687; cv=pass; d=google.com; s=arc-20160816; b=QmlUm/lgEb1EjgINVUrRg3J5hv+GqUZ9+ILWz5nPVyzevIZVEJPidIlwOZ/9hyQMVI yh3JZK9l9VFxGdDDSlhAKmoGu0UQWiGL+OCQ7wmgA1DtUElFbxjL717I7xKSfEu74mBe USd+KsQco42G7dqnc7+W0juE+zdb01AuGtHLDQ7R5GWgu+Vgcr8j9RfGvpJn1BKsneca 4Im1o/OE/lqhIuwehtFea32r3uqdBKHfPRtkU3AMIgIIsXUiZiiMdBRl3RhPgbj2yEjt wcTbaV4FYblLYXN8DuH47qycNYtcg5AbYp+2vQcQe0PxOHdIxYqdh9LkAC6rRGDu5r4D +BMw== 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:reply-to:feedback-id :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=rW9oS6/6YGExDYUwIbLRD7IHeBP1MK8h4TW3TIF7u4g=; fh=Rxsc2yi0Uvbi/Jl3iVzn9j7ZgIK+P40K1/XFT5GBodU=; b=t21TvIndlfrKAZH5OXBWrljJONw7yQglTiYV2V6goyQm3SXAf99+6KXiR+oWmJEhLg ct0eQpxbQSu6DA6m8ncOVGCsiulpNo4XRk8dJ8wQOd3yez6yLnDdL6Wc43KDse+B1Qa8 Z+TUTKB+61m7UqFjQiTRD/TD8f69Q4UL2aIw4Z1M8G6ocD5XzjJ3dFii651HSzlyWYny 9n3BAGb7K2nScF17KFv8fX7WPNxGR8XTdN4wJYEl3hARLwsQyHw1isWm1mpSfu/rMtlj XepPWb6RQgMvo/weoFUs91zHPaiidX0EdNSGHHPCNwuHnQAMb27CFRoBLtLp5/jqFFC1 6zGg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=giYg9AAr; spf=pass (google.com: domain of fm-256628-202308031318049f863767d6a9d5f4d8-azhc7s@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-256628-202308031318049f863767d6a9d5f4d8-AzHC7s@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20221208; t=1691068687; x=1691673487; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rW9oS6/6YGExDYUwIbLRD7IHeBP1MK8h4TW3TIF7u4g=; b=C3XTLqb1/iDiFEYcKh/5un24RjKlMkbXL/eIpvq8JhySi/0hhhAVhkPDn4VZJwlP22 JqenjtXpnk5nn7Bdr62keC7dl9ZjENKZN9thpFXM/7lzTt6iGTF9t8dQKttrnE02r7ec md6iBydw31JO/fIHbmkad+V+0noOGKTjfqUYTcSfmi+b+K1HjiPoBbxZFoIiD8nc8M3U GfVKA00uXAZDCqxIlTinCtDUMBUNJSuv1YyZETz12r+Xu+MJqVxMcBOJfqinbmKsDakt nAe00X+6f7Tbg6G9isWgFHDr5CkLpETjMnHJnnkgZ0KU+J8Aw+ECh1dxW0Buc34OcYBz np4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691068687; x=1691673487; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=rW9oS6/6YGExDYUwIbLRD7IHeBP1MK8h4TW3TIF7u4g=; b=Cmva/7kxzoApSLTr8w+MGE1a0T/GGcnDybRXOjwCLDDfmmCb7YChGKjHGIY9xUZ0PX HMzkOsHxCFP2gZ9GKcdqyKqPkSUfnjhyJq8QTNlvacbji5p+Ujx08BGbfnnPhCuUmDcm e/B8wEq6Zy0dfon8amVHG6e0XVpGZK6YiucQ8YLOVTSgFu86sqANmFAMrIPg4EzKIxfK vRj/KX+h8o6pPwCYPzhdW3RyWRTZj2p6kCnj0RsYU6Cxrj/FcfxVL5gQ/LPvLeVAK+9x x0yu38SPh3rQ1ZGI0pWuLbDb8dZU5zlpj43Vw7ct2w6cvxYovGvAv/X7ETZNVlsfIJ52 Dj2w== X-Gm-Message-State: ABy/qLZG8549W/KxHAgalU8Wnn4hZAi72mGUdpdhUVQFxJjzue0tK5dJ U6TOEOv/j/g1SjU8iWK6iRA= X-Google-Smtp-Source: APBJJlHBs6tXtC+3Ig4XLDP7WmfAkPysQr20Ad9QCBFHCiDKMFsqtloQoHoZUvcbnC/J9VUaX4+Ovg== X-Received: by 2002:a05:600c:3b16:b0:3f9:88d:9518 with SMTP id m22-20020a05600c3b1600b003f9088d9518mr14734764wms.0.1691068686773; Thu, 03 Aug 2023 06:18:06 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:1e29:b0:3fe:1974:f893 with SMTP id ay41-20020a05600c1e2900b003fe1974f893ls1981330wmb.0.-pod-prod-07-eu; Thu, 03 Aug 2023 06:18:05 -0700 (PDT) X-Received: by 2002:a05:600c:21d5:b0:3fd:2e1d:eca1 with SMTP id x21-20020a05600c21d500b003fd2e1deca1mr7021390wmj.4.1691068685035; Thu, 03 Aug 2023 06:18:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691068685; cv=none; d=google.com; s=arc-20160816; b=nzP5YJPsaQN3+vQ3Slem+UBlnVTSrQQ41PGYrF7//eDB56OsMh1h/UDeHcSlzJk1R8 JMnXpI3wPtVYcerPkTQtNAu/yl4qPSx2YwSR4xDgDd+tAYzvTfjmHXNKN1RZ4Lt+8Qci L7AapCvXZNLXrlXdzHo7Uvb3nSPn25Vgml+VKwW85ft/L5aPeENSJxeq8cg9MgjTD+UR YyYL51aVX6YUcBop74Nm/EsUxs35BYbrAcWX8mjatUh5DzyjZMaQHeG4YdI6sLRqpsH9 ZEwHoCQVqaVYws3bHYkD5oadxtD708ZscT8nKus2AEGI2HzCHJCe1f1872f6wv6gLlmj zKnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=smDoI7Er7Ly1CgA6FYBCQEI6KpafzOik/mjceS4dINY=; fh=tMagXgaQB4MqfyNq/lNreuMo9dIVjrN3Hs55Rq/refI=; b=z6ODDAMTzS2jw5ZCtabHAWRF/NGh6CiznNdjxSerhZyAO26TPas4VNFIarv/cZRpJ4 dnZrTy6SivQiTK5RrGlR3ST8qFm0elbyRXlyirCyi5EeVWfF6jbzGKlkW1gUp0tPmlwq oZMQpeds2G7Si82aRzMAtrVbYoEGrALu1FBbJ1Fsm2hfILwFwbEkdeXN1Tgjmd08e0/i 5rpQjQ0DOuiv52UhGkQDA/jfbM4VExv93mhELyjt8z49MJKe9aRASJJoRwIsmkZ4opGU brVRDYz9OtYLO9tWEbdzbn9rNM+mMLX6SIo3wFvEb9E04cEGaZbYIIEEtsgDT2eMhKE+ mLaw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=giYg9AAr; spf=pass (google.com: domain of fm-256628-202308031318049f863767d6a9d5f4d8-azhc7s@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-256628-202308031318049f863767d6a9d5f4d8-AzHC7s@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id o35-20020a05600c512300b003fe2591111dsi272305wms.1.2023.08.03.06.18.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Aug 2023 06:18:05 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-256628-202308031318049f863767d6a9d5f4d8-azhc7s@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202308031318049f863767d6a9d5f4d8 for ; Thu, 03 Aug 2023 15:18:04 +0200 X-Patchwork-Original-From: "'Peter Marko' via swupdate" From: "Marko, Peter" To: swupdate@googlegroups.com Cc: Peter Marko Subject: [swupdate] [meta-swupdate][kirkstone][PATCH v3] image_types_zchunk: fix IMAGE_NAME Date: Thu, 3 Aug 2023 15:16:58 +0200 Message-Id: <20230803131658.86448-1-peter.marko@siemens.com> In-Reply-To: <20230803130610.86059-1-peter.marko@siemens.com> References: <20230803130610.86059-1-peter.marko@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-256628:519-21489:flowmailer X-Original-Sender: peter.marko@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=giYg9AAr; spf=pass (google.com: domain of fm-256628-202308031318049f863767d6a9d5f4d8-azhc7s@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-256628-202308031318049f863767d6a9d5f4d8-AzHC7s@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Peter Marko Reply-To: Peter Marko 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: , The backported code does not work properly in kirkstone branch because kirkstone does not have following commit: https://git.openembedded.org/openembedded-core/commit/?id=26d97acc71379ab6702fa54a23b6542a3f51779c So re-add ${IMAGE_NAME_SUFFIX} to all ${IMAGE_NAME} uses. Signed-off-by: Peter Marko --- classes/image_types_zchunk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/image_types_zchunk.bbclass b/classes/image_types_zchunk.bbclass index 2c477ba..fe73c34 100644 --- a/classes/image_types_zchunk.bbclass +++ b/classes/image_types_zchunk.bbclass @@ -1,7 +1,7 @@ CONVERSIONTYPES += "zck zckheader" -CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}.${type}" -CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}.${type} of=${IMAGE_NAME}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}.${type} | grep 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" +CONVERSION_CMD:zck = "zck --output ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zck -u --chunk-hash-type sha256 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" +CONVERSION_CMD:zckheader = "dd if=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} of=${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.zckheader count=1 bs=`zck_read_header -v ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} | grep 'Header size' | cut -d ':' -f 2 | tr -d '[:space:]'`" CONVERSION_DEPENDS_zck = "zchunk-native" CONVERSION_DEPENDS_zckheader = "zchunk-native"