[isar-cip-core] start-qemu: Pick up architecture from .config.yaml if left out

Commit Message

Jan Kiszka June 20, 2023, 5:18 a.m. UTC

From: Jan Kiszka <[e-mail]>

We already derive most other parameters from that file, and this allows
to simply call "./start-qemu.sh" after a menu-based build.

Signed-off-by: Jan Kiszka <[e-mail]>
---
 start-qemu.sh | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

Patch

diff --git a/start-qemu.sh b/start-qemu.sh
index 5d48e0dc..b6f9d012 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -12,9 +12,12 @@ 
 
 usage()
 {
-	echo "Usage: $0 ARCHITECTURE [QEMU_OPTIONS]"
+	echo "Usage: $0 [ARCHITECTURE [QEMU_OPTIONS]]"
 	echo
-	echo "Environment variables (default to settings in .config.yml):"
+	echo "The architecture defaults to the setting in .config.yaml and can be left out"
+	echo "if the built was done via \"kas-container menu\"."
+	echo
+	echo "Environment variables (default to settings in .config.yaml):"
 	echo "  QEMU_PATH         use a locally built QEMU version"
 	echo "  SWUPDATE_BOOT     boot swupdate image"
 	echo "  SECURE_BOOT       start a secure boot environment"
@@ -59,8 +62,20 @@  if grep -s -q "IMAGE_TESTING: true" .config.yaml; then
 	TEST_IMAGE="-test"
 fi
 
-arch="$1"
-shift 1
+if [ -n "$1" ]; then
+	arch="$1"
+	shift 1
+else
+	if grep -s -q "TARGET_QEMU_AMD64: true" .config.yaml; then
+		arch=amd64
+	elif grep -s -q "TARGET_QEMU_ARM64: true" .config.yaml; then
+		arch=arm64
+	elif grep -s -q "TARGET_QEMU_ARM: true" .config.yaml; then
+		arch=arm
+	elif grep -s -q "TARGET_QEMU_RISCV64: true" .config.yaml; then
+		arch=riscv64
+	fi
+fi
 
 case "${arch}" in
 	x86|x86_64|amd64)