diff mbox series

[isar-cip-core] start-qemu.sh: Fix arm support

Message ID 2f061564-9c1a-d330-ba59-2fdd770f6277@siemens.com (mailing list archive)
State Handled Elsewhere
Headers show
Series [isar-cip-core] start-qemu.sh: Fix arm support | expand

Commit Message

Jan Kiszka May 10, 2022, 9:54 a.m. UTC 
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 mbox series

Patch

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"