From e7108f52cfee87fbfee95881ff8659d6276f69af Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 3 Feb 2026 15:04:04 +0100 Subject: [PATCH] board/common: fix extration of rootfs.squashfs in release tarball [skip ci] Signed-off-by: Joachim Wiberg --- board/common/qemu/run.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/board/common/qemu/run.sh b/board/common/qemu/run.sh index c47d0e8b..69c3d71e 100755 --- a/board/common/qemu/run.sh +++ b/board/common/qemu/run.sh @@ -358,13 +358,12 @@ extract_squashfs() run_qemu() { # Auto-extract rootfs.squashfs from rootfs.itb if needed for initrd mode - if [ "$CONFIG_QEMU_ROOTFS_INITRD" = "y" ]; then - if [ "$CONFIG_QEMU_ROOTFS" = "rootfs.squashfs" ] && [ ! -f "rootfs.squashfs" ]; then - if [ -f "rootfs.itb" ]; then - extract_squashfs "rootfs.itb" "rootfs.squashfs" - else - die "Missing rootfs.squashfs and cannot find rootfs.itb to extract it from" - fi + if [ "$CONFIG_QEMU_ROOTFS_INITRD" = "y" ] && [ ! -f "$CONFIG_QEMU_ROOTFS" ]; then + itb="${CONFIG_QEMU_ROOTFS%.squashfs}.itb" + if [ -f "$itb" ]; then + extract_squashfs "$itb" "$CONFIG_QEMU_ROOTFS" + else + die "Missing $CONFIG_QEMU_ROOTFS and cannot find $itb to extract it from" fi fi