From: Sai.Sathujoda@toshiba-tsip.com
To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com
Cc: Sai <Sai.Sathujoda@toshiba-tsip.com>,
dinesh.kumar@toshiba-tsip.com, kazuhiro3.hayashi@toshiba.co.jp
Subject: [isar-cip-core 2/3] deploy-cip-core.sh: Workaround to search for swupdate initrd image name
Date: Wed, 30 Aug 2023 10:11:14 +0530 [thread overview]
Message-ID: <20230830044115.1112349-3-Sai.Sathujoda@toshiba-tsip.com> (raw)
In-Reply-To: <20230830044115.1112349-1-Sai.Sathujoda@toshiba-tsip.com>
From: Sai <Sai.Sathujoda@toshiba-tsip.com>
Since the security image is now included with swupdate feature, deployment
of initrd image will fail in CI due to name mismatch. So this workaround
will search for initrd image name as defined in read-only-rootfs.bbclass
Signed-off-by: Sai <Sai.Sathujoda@toshiba-tsip.com>
---
scripts/deploy-cip-core.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/deploy-cip-core.sh b/scripts/deploy-cip-core.sh
index eaa8974..868e28e 100755
--- a/scripts/deploy-cip-core.sh
+++ b/scripts/deploy-cip-core.sh
@@ -46,9 +46,16 @@ KERNEL_IMAGE="$BASE_PATH-vmlinu[xz]"
if [ -f "build/tmp/deploy/images/$TARGET/zImage" ]; then
KERNEL_IMAGE=build/tmp/deploy/images/$TARGET/zImage
fi
+
+INITRD_IMAGE="${BASE_PATH}-initrd.img"
+# swupdate image initrd search workaround
+if [ -f "build/tmp/deployimages/$TARGET/cip-core-initramfs-cip-core-$RELEASE-$TARGET.initrd.img" ]; then
+ INITRD_IMAGE=build/tmp/deploy/images/$TARGET/cip-core-initramfs-cip-core-$RELEASE-$TARGET.initrd.img
+fi
+
# shellcheck disable=SC2086
aws s3 cp --no-progress --acl public-read $KERNEL_IMAGE "${S3_TARGET}"
-aws s3 cp --no-progress --acl public-read "${BASE_PATH}-initrd.img" "${S3_TARGET}"
+aws s3 cp --no-progress --acl public-read "${INITRD_IMAGE}" "${S3_TARGET}"
if [ "$DTB" != "none" ]; then
aws s3 cp --no-progress --acl public-read build/tmp/deploy/images/*/"$DTB" "${S3_TARGET}"
--
2.30.2
next prev parent reply other threads:[~2023-08-30 4:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-30 4:41 [isar-cip-core 0/3] Enabling additional features in security image Sai.Sathujoda
2023-08-30 4:41 ` [isar-cip-core 1/3] Kconfig: Opt additional IEC 62443-4-2 features when security option is selected Sai.Sathujoda
2023-08-30 4:41 ` Sai.Sathujoda [this message]
2023-08-30 6:39 ` [isar-cip-core 2/3] deploy-cip-core.sh: Workaround to search for swupdate initrd image name Jan Kiszka
2023-08-30 4:41 ` [isar-cip-core 3/3] security.yml: Add additional features to security image Sai.Sathujoda
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=20230830044115.1112349-3-Sai.Sathujoda@toshiba-tsip.com \
--to=sai.sathujoda@toshiba-tsip.com \
--cc=cip-dev@lists.cip-project.org \
--cc=dinesh.kumar@toshiba-tsip.com \
--cc=jan.kiszka@siemens.com \
--cc=kazuhiro3.hayashi@toshiba.co.jp \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.