From patchwork Mon May 10 01:40:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 12246655 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.8 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 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 E34D5C43461 for ; Mon, 10 May 2021 01:40:21 +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 8DEF6613DB for ; Mon, 10 May 2021 01:40:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DEF6613DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=toshiba.co.jp Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=bounce+64572+6445+4520388+8129055@lists.cip-project.org X-Received: by 127.0.0.2 with SMTP id USK7YY4521723xKRb0aOHeZb; Sun, 09 May 2021 18:40:21 -0700 X-Received: from mo-csw.securemx.jp (mo-csw.securemx.jp [210.130.202.158]) by mx.groups.io with SMTP id smtpd.web09.26282.1620610819206725180 for ; Sun, 09 May 2021 18:40:20 -0700 X-Received: by mo-csw.securemx.jp (mx-mo-csw1116) id 14A1eG6Q000894; Mon, 10 May 2021 10:40:17 +0900 X-Iguazu-Qid: 2wHHDhxhl2eMywswD8 X-Iguazu-QSIG: v=2; s=0; t=1620610816; q=2wHHDhxhl2eMywswD8; m=KOC6jYYQDF5oV5iYBAMWBXCUDOiS0FOdy6pE53wYJjo= X-Received: from imx12-a.toshiba.co.jp (imx12-a.toshiba.co.jp [61.202.160.135]) by relay.securemx.jp (mx-mr1113) id 14A1eFsf016944 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 10 May 2021 10:40:16 +0900 X-Received: from enc02.toshiba.co.jp (enc02.toshiba.co.jp [61.202.160.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by imx12-a.toshiba.co.jp (Postfix) with ESMTPS id BBF291000D6; Mon, 10 May 2021 10:40:15 +0900 (JST) X-Received: from hop101.toshiba.co.jp ([133.199.85.107]) by enc02.toshiba.co.jp with ESMTP id 14A1eD1c008298; Mon, 10 May 2021 10:40:15 +0900 From: "Nobuhiro Iwamatsu" To: jan.kiszka@siemens.com Cc: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu Subject: [cip-dev] [isar-cip-core][Resend PATCH 2/4] scripts/deploy-cip-core.sh: Fix to correct filename with security extension Date: Mon, 10 May 2021 10:40:09 +0900 X-TSB-HOP: ON Message-Id: <20210510014011.66494-2-nobuhiro1.iwamatsu@toshiba.co.jp> In-Reply-To: <20210510014011.66494-1-nobuhiro1.iwamatsu@toshiba.co.jp> References: <20210510014011.66494-1-nobuhiro1.iwamatsu@toshiba.co.jp> 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: NzVDNBdvanLSmczj6JWkIWQKx4520388AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.cip-project.org; q=dns/txt; s=20140610; t=1620610821; bh=LE2R9TuLTJ82CbPyCy9u/oLl7il3e1w5+9h9Tw9qaFg=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=UIHwLxE+StDKtX4DM6w0Tk+N5VKV0IydmojwgQQepANC/6HhcoLrip8IWajG3EsLBl0 fPl9hA0H8FlXRn36ARyBqdLzuKDQIyncOnAWYODZi+JdtcgLYgxbibR05fW5So5J+Ycz5 w7dfA5/eg4N8WNd/TJ8xg5D24AvZA88ySns= Since security extension uses the bb file, not the extension using local.conf, the generated filename is different. This sets the correct filename for security extensions. Signed-off-by: Nobuhiro Iwamatsu --- scripts/deploy-cip-core.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/deploy-cip-core.sh b/scripts/deploy-cip-core.sh index 3593d51..0b8bbe6 100755 --- a/scripts/deploy-cip-core.sh +++ b/scripts/deploy-cip-core.sh @@ -19,13 +19,19 @@ TARGET=$2 EXTENSION=$3 DTB=$4 -BASE_PATH=build/tmp/deploy/images/$TARGET/cip-core-image-cip-core-$RELEASE-$TARGET +BASE_FILENAME=cip-core-image-cip-core-$RELEASE-$TARGET if [ "${EXTENSION}" != "base" ] ; then - BASE_PATH=build/tmp/deploy/images/$TARGET/cip-core-image-cip-core-$RELEASE-$TARGET-$EXTENSION + if [ "${EXTENSION}" = "security" ] ; then + BASE_FILENAME=cip-core-image-$EXTENSION-cip-core-$RELEASE-$TARGET + else + BASE_FILENAME=cip-core-image-cip-core-$RELEASE-$TARGET-$EXTENSION + fi fi +BASE_PATH=build/tmp/deploy/images/$TARGET/$BASE_FILENAME + if [ -f $BASE_PATH.wic.img ] ; then - echo "Compressing cip-core-image-cip-core-$RELEASE-$TARGET.wic.img..." + echo "Compressing $BASE_FILENAME.wic.img..." xz -9 -k $BASE_PATH.wic.img echo "Uploading artifacts..."