From: Quirin Gylstorff <Quirin.Gylstorff@siemens.com>
To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com,
adriaan.schmidt@siemens.com
Subject: [cip-dev][isar-cip-core][RFC v2 2/4] start-qemu.sh: adapt to new image names
Date: Tue, 7 Jun 2022 12:08:04 +0200 [thread overview]
Message-ID: <20220607100806.133889-3-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20220607100806.133889-1-Quirin.Gylstorff@siemens.com>
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
start-qemu.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/start-qemu.sh b/start-qemu.sh
index 80c0cd7..f066209 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -134,13 +134,13 @@ if [ -n "${SECURE_BOOT}${SWUPDATE_BOOT}" ]; then
-global isa-fdc.driveA= \
-drive if=pflash,format=raw,unit=0,readonly=on,file=${ovmf_code} \
-drive if=pflash,format=raw,file=${ovmf_vars} \
- -drive file=${IMAGE_PREFIX}.wic.img,discard=unmap,if=none,id=disk,format=raw \
+ -drive file=${IMAGE_PREFIX}.wic,discard=unmap,if=none,id=disk,format=raw \
${QEMU_COMMON_OPTIONS} "$@"
else
ovmf_code=${OVMF_CODE:-./build/tmp/deploy/images/qemu-amd64/OVMF/OVMF_CODE_4M.fd}
${QEMU_PATH}${QEMU} \
- -drive file=${IMAGE_PREFIX}.wic.img,discard=unmap,if=none,id=disk,format=raw \
+ -drive file=${IMAGE_PREFIX}.wic,discard=unmap,if=none,id=disk,format=raw \
-drive if=pflash,format=raw,unit=0,readonly=on,file=${ovmf_code} \
${QEMU_COMMON_OPTIONS} "$@"
fi
@@ -149,7 +149,7 @@ if [ -n "${SECURE_BOOT}${SWUPDATE_BOOT}" ]; then
u_boot_bin=${FIRMWARE_BIN:-./build/tmp/deploy/images/qemu-arm64/firmware.bin}
${QEMU_PATH}${QEMU} \
- -drive file=${IMAGE_PREFIX}.wic.img,discard=unmap,if=none,id=disk,format=raw \
+ -drive file=${IMAGE_PREFIX}.wic,discard=unmap,if=none,id=disk,format=raw \
-bios ${u_boot_bin} \
${QEMU_COMMON_OPTIONS} "$@"
;;
@@ -159,7 +159,7 @@ if [ -n "${SECURE_BOOT}${SWUPDATE_BOOT}" ]; then
;;
esac
else
- IMAGE_FILE=$(ls ${IMAGE_PREFIX}.ext4.img)
+ IMAGE_FILE=$(ls ${IMAGE_PREFIX}.ext4)
KERNEL_FILE=$(ls ${IMAGE_PREFIX}-vmlinu* | tail -1)
INITRD_FILE=$(ls ${IMAGE_PREFIX}-initrd.img* | tail -1)
--
2.35.1
next prev parent reply other threads:[~2022-06-07 10:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-03 11:56 [cip-dev][isar-cip-core][RFC 0/4] Adapt isar-cip-core to ISAR IMAGE_CMD_* Quirin Gylstorff
2022-06-03 11:56 ` [cip-dev][isar-cip-core][RFC 1/4] ISAR update Quirin Gylstorff
2022-06-03 11:56 ` [cip-dev][isar-cip-core][RFC 2/4] start-qemu.sh: adapt to new image names Quirin Gylstorff
2022-06-03 11:56 ` [cip-dev][isar-cip-core][RFC 3/4] Adapt swupdate and verity to use new IMAGE_CMD_* Quirin Gylstorff
2022-06-07 7:32 ` Jan Kiszka
2022-06-07 8:39 ` Gylstorff Quirin
2022-06-03 11:56 ` [cip-dev][isar-cip-core][RFC 4/4] scripts/deploy-cip-core: Adapt to new image names Quirin Gylstorff
2022-06-03 15:27 ` [cip-dev][isar-cip-core][RFC 0/4] Adapt isar-cip-core to ISAR IMAGE_CMD_* Jan Kiszka
2022-06-03 15:29 ` Jan Kiszka
2022-06-03 15:33 ` Gylstorff Quirin
2022-06-07 7:23 ` Jan Kiszka
2022-06-07 10:08 ` [cip-dev][isar-cip-core][RFC v2 " Quirin Gylstorff
2022-06-07 10:08 ` [cip-dev][isar-cip-core][RFC v2 1/4] ISAR update Quirin Gylstorff
2022-06-07 10:08 ` Quirin Gylstorff [this message]
2022-06-07 10:08 ` [cip-dev][isar-cip-core][RFC v2 3/4] Adapt swupdate and verity to use new IMAGE_CMD_* Quirin Gylstorff
2022-06-07 10:08 ` [cip-dev][isar-cip-core][RFC v2 4/4] scripts/deploy-cip-core: Adapt to new image names Quirin Gylstorff
2022-06-10 11:32 ` [cip-dev][isar-cip-core][RFC v3 0/5] Adapt isar-cip-core to ISAR IMAGE_CMD_* Quirin Gylstorff
2022-06-10 11:32 ` [cip-dev][isar-cip-core][RFC v3 1/5] ISAR update Quirin Gylstorff
2022-06-10 11:32 ` [cip-dev][isar-cip-core][RFC v3 2/5] u-boot-qemu-arm64: Adapt to 'Do not use shell environment' Quirin Gylstorff
2022-06-10 11:33 ` [cip-dev][isar-cip-core][RFC v3 3/5] start-qemu.sh: adapt to new image names Quirin Gylstorff
2022-06-10 11:33 ` [cip-dev][isar-cip-core][RFC v3 4/5] Adapt swupdate and verity to use new IMAGE_CMD_* Quirin Gylstorff
2022-06-10 11:33 ` [cip-dev][isar-cip-core][RFC v3 5/5] scripts/deploy-cip-core: Adapt to new image names Quirin Gylstorff
2022-06-13 11:02 ` [cip-dev][isar-cip-core][RFC v3 0/5] Adapt isar-cip-core to ISAR IMAGE_CMD_* 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=20220607100806.133889-3-Quirin.Gylstorff@siemens.com \
--to=quirin.gylstorff@siemens.com \
--cc=adriaan.schmidt@siemens.com \
--cc=cip-dev@lists.cip-project.org \
--cc=jan.kiszka@siemens.com \
/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.