From 203197fd4e7ee08b0e026e2d4a7b1a6eb22b1775 Mon Sep 17 00:00:00 2001 From: Masami Ichikawa Date: Mon, 11 May 2026 00:11:37 +0000 Subject: [PATCH 1/2] classes/sdk-installer: Update SDK file name Isar changes image name by commit 13cb77d ("meta: Deploy image build artifacts into distro- and image-specific subdirs"), we need to follow this naming rule convention. Signed-off-by: Masami Ichikawa --- classes/sdk-installer.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sdk-installer.bbclass b/classes/sdk-installer.bbclass index a76ce4a9..c14aa494 100644 --- a/classes/sdk-installer.bbclass +++ b/classes/sdk-installer.bbclass @@ -8,7 +8,7 @@ # # SPDX-License-Identifier: MIT # -EMLINUX_SDK_BASE_NAME="${PN}-${DISTRO}-${MACHINE}" +EMLINUX_SDK_BASE_NAME="${MACHINE}" EMLINUX_SDK_FILE_NAME="${EMLINUX_SDK_BASE_NAME}.${SDK_FORMATS}" EMLINUX_SDK_FILE_PATH="${DEPLOY_DIR_IMAGE}/${EMLINUX_SDK_FILE_NAME}" EMLINUX_SDK_INSTALLER_NAME="${PN}-${DISTRO}-${MACHINE}-sdk-installer.sh" From 54fde52c77bfa7219336cff2d87a3b5f56bb26d1 Mon Sep 17 00:00:00 2001 From: Masami Ichikawa Date: Mon, 11 May 2026 03:56:06 +0000 Subject: [PATCH 2/2] scripts/runqemu: Update path for build artifacts Isar changes image name by commit 13cb77d ("meta: Deploy image build artifacts into distro- and image-specific subdirs"), we need to follow this naming rule convention. Signed-off-by: Masami Ichikawa --- scripts/runqemu | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index af9433f7..0d3ce16b 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -22,13 +22,15 @@ if [ $# -ne 3 ]; then exit 1 fi +artifact_dir="$DEPLOY_DIR/images/${1}/${2}-${3}" + case $1 in "qemu-amd64") arch="x86_64" machine="q35,accel=kvm:tcg" cpu="qemu64" kernel_type="vmlinuz" - disk_drive="-device ide-hd,drive=disk -drive file=$DEPLOY_DIR/images/$1/$3-$2-$1.ext4,discard=unmap,if=none,id=disk,format=raw" + disk_drive="-device ide-hd,drive=disk -drive file=$artifact_dir/$1.ext4,discard=unmap,if=none,id=disk,format=raw" block_device="/dev/sda" console="ttyS0" ;; @@ -37,7 +39,7 @@ case $1 in machine="virt" cpu="cortex-a57" kernel_type="vmlinux" - disk_drive="-device virtio-blk-device,drive=disk0 -drive id=disk0,file=$DEPLOY_DIR/images/$1/$3-$2-$1.ext4,if=none,format=raw" + disk_drive="-device virtio-blk-device,drive=disk0 -drive id=disk0,file=$artifact_dir/$1.ext4,if=none,format=raw" block_device="/dev/vda" console="ttyAMA0" ;; @@ -46,7 +48,7 @@ case $1 in machine="virt-2.12" cpu="cortex-a15" kernel_type="vmlinuz" - disk_drive="-device virtio-blk-device,drive=disk0 -drive id=disk0,file=$DEPLOY_DIR/images/$1/$3-$2-$1.ext4,if=none,format=raw" + disk_drive="-device virtio-blk-device,drive=disk0 -drive id=disk0,file=$artifact_dir/$1.ext4,if=none,format=raw" block_device="/dev/vda" console="ttyAMA0" ;; @@ -74,6 +76,6 @@ qemu-system-$arch \ -cpu $cpu \ -m 512 \ -serial mon:stdio \ - -kernel $DEPLOY_DIR/images/$1/$3-$2-$1-$kernel_type \ - -initrd $DEPLOY_DIR/images/$1/$3-$2-$1-initrd.img \ + -kernel $artifact_dir/$kernel_type \ + -initrd $artifact_dir/initrd.img \ -append "root=$block_device rw mem=512M ip=dhcp console=$console"