All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: cip-dev <cip-dev@lists.cip-project.org>
Subject: [isar-cip-core][PATCH] start-qemu.sh: Fix arm support
Date: Tue, 10 May 2022 11:54:03 +0200	[thread overview]
Message-ID: <2f061564-9c1a-d330-ba59-2fdd770f6277@siemens.com> (raw)

From: Jan Kiszka <jan.kiszka@siemens.com>

There is no "qemu-armhf", we called it qemu-arm. Therefore, finding its
images failed. Rename DISTRO_ARCH to QEMU_ARCH and set it to "arm" for
the related target.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 start-qemu.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/start-qemu.sh b/start-qemu.sh
index ad4fca5..80c0cd7 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -50,7 +50,7 @@ shift 1
 
 case "${arch}" in
 	x86|x86_64|amd64)
-		DISTRO_ARCH=amd64
+		QEMU_ARCH=amd64
 		QEMU=qemu-system-x86_64
 		QEMU_EXTRA_ARGS=" \
 			-cpu qemu64 \
@@ -70,7 +70,7 @@ case "${arch}" in
 			root=/dev/sda"
 		;;
 	arm64|aarch64)
-		DISTRO_ARCH=arm64
+		QEMU_ARCH=arm64
 		QEMU=qemu-system-aarch64
 		QEMU_EXTRA_ARGS=" \
 			-cpu cortex-a57 \
@@ -84,7 +84,7 @@ case "${arch}" in
 			root=/dev/vda"
 		;;
 	arm|armhf)
-		DISTRO_ARCH=armhf
+		QEMU_ARCH=arm
 		QEMU=qemu-system-arm
 		QEMU_EXTRA_ARGS=" \
 			-cpu cortex-a15 \
@@ -106,7 +106,7 @@ case "${arch}" in
 		;;
 esac
 
-IMAGE_PREFIX="$(dirname $0)/build/tmp/deploy/images/qemu-${DISTRO_ARCH}/${TARGET_IMAGE}-cip-core-${DISTRO_RELEASE}-qemu-${DISTRO_ARCH}"
+IMAGE_PREFIX="$(dirname $0)/build/tmp/deploy/images/qemu-${QEMU_ARCH}/${TARGET_IMAGE}-cip-core-${DISTRO_RELEASE}-qemu-${QEMU_ARCH}"
 
 if [ -z "${DISPLAY}" ]; then
 	QEMU_EXTRA_ARGS="${QEMU_EXTRA_ARGS} -nographic"
-- 
2.35.3


                 reply	other threads:[~2022-05-10  9:54 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=2f061564-9c1a-d330-ba59-2fdd770f6277@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    /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.