All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Nobuhiro Iwamatsu" <nobuhiro1.iwamatsu@toshiba.co.jp>
To: jan.kiszka@siemens.com
Cc: cip-dev@lists.cip-project.org,
	Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
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	[thread overview]
Message-ID: <20210510014011.66494-2-nobuhiro1.iwamatsu@toshiba.co.jp> (raw)
In-Reply-To: <20210510014011.66494-1-nobuhiro1.iwamatsu@toshiba.co.jp>

[-- Attachment #1: Type: text/plain, Size: 1329 bytes --]

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 <nobuhiro1.iwamatsu@toshiba.co.jp>
---
 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..."
-- 
2.31.1


[-- Attachment #2: Type: text/plain, Size: 428 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6445): https://lists.cip-project.org/g/cip-dev/message/6445
Mute This Topic: https://lists.cip-project.org/mt/82710799/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


  reply	other threads:[~2021-05-10  1:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-10  1:40 [cip-dev] [isar-cip-core][Resend PATCH 1/4] scripts/deploy-cip-core.sh: Fix uploading tar.gz image Nobuhiro Iwamatsu
2021-05-10  1:40 ` Nobuhiro Iwamatsu [this message]
2021-05-10  1:40 ` [cip-dev] [isar-cip-core][Resend PATCH 3/4] .gitlab-ci.yml: Drop 'deploy: disable' from build:qemu-amd64-base Nobuhiro Iwamatsu
2021-05-10  1:40 ` [cip-dev] [isar-cip-core][Resend PATCH 4/4] .gitlab-ci.yml: Add build:qemu-amd64-test target Nobuhiro Iwamatsu
2021-05-11 13:30 ` [cip-dev] [isar-cip-core][Resend PATCH 1/4] scripts/deploy-cip-core.sh: Fix uploading tar.gz image Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210510014011.66494-2-nobuhiro1.iwamatsu@toshiba.co.jp \
    --to=nobuhiro1.iwamatsu@toshiba.co.jp \
    --cc=cip-dev@lists.cip-project.org \
    --cc=jan.kiszka@siemens.com \
    --subject='Re: [cip-dev] [isar-cip-core][Resend PATCH 2/4] scripts/deploy-cip-core.sh: Fix to correct filename with security extension' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.