From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7330575233373437952 X-Received: by 2002:a05:6808:2286:b0:3be:55d7:3d18 with SMTP id bo6-20020a056808228600b003be55d73d18mr1840516oib.6.1706782549889; Thu, 01 Feb 2024 02:15:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:53d9:0:b0:42b:f1aa:a500 with SMTP id c25-20020ac853d9000000b0042bf1aaa500ls1208972qtq.1.-pod-prod-00-us; Thu, 01 Feb 2024 02:15:49 -0800 (PST) X-Received: by 2002:a05:620a:2454:b0:785:3f03:ba24 with SMTP id h20-20020a05620a245400b007853f03ba24mr90725qkn.6.1706782549265; Thu, 01 Feb 2024 02:15:49 -0800 (PST) Received: by 2002:a05:620a:1709:b0:785:b29:d3b0 with SMTP id af79cd13be357-7854438d676ms85a; Wed, 31 Jan 2024 22:59:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IGrO8vbnVuIxlsjyO+/9yZ/Z32ZQ62wt7FO8J+2J3oFVLUllN/Q/oPgdSqM9/UA8yFDqVQP X-Received: by 2002:a05:6512:2241:b0:510:c48:e5de with SMTP id i1-20020a056512224100b005100c48e5demr1318494lfu.57.1706770762852; Wed, 31 Jan 2024 22:59:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706770762; cv=none; d=google.com; s=arc-20160816; b=Ie/lZhNolr9ACtN6dg81bc6UnYVB27y7uZA81xqjFygTt/LbdikFm0+x4a+nP0INoI IF+FA7RPfQhZNwPkaiJtdGvpZeMvQKhyBdteDePT2RU4Tcpv6BE+Cs0v2t1sCGfhMImh V67NM461/sWjd2tl55S/flBBzyfZfOiIq12qswRnz/wr20Q7X3aPFHcuxzyx1i4u899Y wzeFwjdinB5PVUZB+9srndyHpWFAfgZt7atu+bG1+Kf+ApbeZMnfNIax2iXrzlNsQrQR HOfn0WiNMt8+y0W/VzGa5NIVGT8+69205HEf+I7EV0xik75a8kPMAvC3N8r1XKvwfOSA YDkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=3kJyPY6v3Ni2XNu0QLmeUN/MCse4PeYr0+DdHJWTHYI=; fh=m/jjxtlxUhTkYmkLM8ahJk+CvivPxLiuNYfxh9oPu7o=; b=AUsAvjeB1hP+kzE5EwP66Pi8Zx/6MbXXF5nf3AC8WfbqIRY/oTrVXZCxdVLCV/1Eqo WoXiqfUqP+SdZwDTBwXcXcQisV4n4Ph+le3bn1w2likTCsH6GqrvGg1lIvGp+eVEZl32 lAGTpuW+40dVpn2UGtJkKM2djw4DS4H886pgcKgF92+bONaDlF0K2CCpvwVFXwjTFAhv JPmDKSVs3uuzRcb/2M+YxkIlgagBBZNrZkgyxr55ZBIWGeRmcm6xe8F22FRdnL+NQRQE 4EYfz3Jp6z35g5xsqK5fFIZxG0evjxb9zVAqQTindUV6gAKk8ZUR1R0S867qXNQHyFX2 6dgQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of iskochilov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=iskochilov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id u6-20020ac258c6000000b0050e7c496b6esi472530lfo.13.2024.01.31.22.59.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Jan 2024 22:59:22 -0800 (PST) Received-SPF: pass (google.com: domain of iskochilov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of iskochilov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=iskochilov@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4116xL6S016801 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 1 Feb 2024 07:59:21 +0100 Received: from baighyz.m.ilbers.de (localhost [127.0.0.1]) by baighyz.m.ilbers.de (8.17.1.9/8.17.1.9/Debian-2) with ESMTPS id 4116xLsk1670031 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 1 Feb 2024 06:59:21 GMT Received: (from iskochilov@localhost) by baighyz.m.ilbers.de (8.17.1.9/8.17.1.9/Submit) id 4116xLmR1670030; Thu, 1 Feb 2024 06:59:21 GMT From: Ilia Skochilov To: isar-users@googlegroups.com Cc: Ilia Skochilov Subject: [PATCH 2/3] start_vm: remove shell version Date: Thu, 1 Feb 2024 06:58:44 +0000 Message-Id: <20240201065844.1669957-3-iskochilov@ilbers.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240201065844.1669957-1-iskochilov@ilbers.de> References: <20240201065844.1669957-1-iskochilov@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: YqKn+eHhDUWH Remove shell version of start_vm as it is no longer used. Signed-off-by: Ilia Skochilov --- scripts/start_vm | 156 ----------------------------------------------- 1 file changed, 156 deletions(-) delete mode 100755 scripts/start_vm diff --git a/scripts/start_vm b/scripts/start_vm deleted file mode 100755 index 8c696a4..0000000 --- a/scripts/start_vm +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh -# -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH - -set -e - -ES_OK=0 -ES_BUG=3 - -# Convert bitbake assignments to shell ones -# a = b a=b -# a ?= b a=b -# TODO: Use bitbake to parse vars correctly (overriding in local.conf, etc.) -bb2sh() { - sed 's/[[:space:]]*?*=[[:space:]]*/=/' -} - -start_qemu() { - root=`echo $QEMU_DISK_ARGS \ - | sed 's,##ROOTFS_IMAGE##,'$IMAGE_DIR/$ROOTFS_IMAGE','` - [ -n "$KARGS$EXTRA_KARGS" ] && OPT_KERNEL_ARGS="-append $KARGS$EXTRA_KARGS" - local had_x - echo $- | grep -q x && had_x=1 || had_x=0 - [ $had_x -eq 0 ] && set -x - qemu-system-$QEMU_ARCH \ - -m 1024M \ - -M $QEMU_MACHINE \ - $QCPU \ - -nographic \ - $EXTRA_ARGS \ - $OPT_KERNEL_ARGS \ - $root - [ $had_x -eq 0 ] && set +x -} - -show_help() { - echo "This script runs ISAR image in QEMU emulator." - echo - echo "Usage:" - echo " $0 [params] [BUILD_DIR]" - echo "BUILD_DIR is your ISAR build folder. If not set, current folder" - echo "is used." - echo - echo "Parameters:" - echo " -a, --arch ARCH set isar machine architecture." - echo " Supported: arm, i386, amd64, arm64, mipsel, riscv64." - echo " -b, --build BUILD set path to build directory." - echo " -d, --distro DISTRO set isar Debian distribution." - echo " Supported: buster, bullseye, bookworm" - echo " -o, --out FILE Route QEMU console output to" - echo " specified file." - echo " -p, --pid FILE Store QEMU pid to file." - echo " -s, --secureboot Enable secureboot with default MS keys." - echo " --help display this message and exit." - echo - echo "Exit status:" - echo " 0 if OK," - echo " 3 if invalid parameters are passed." -} - -# Set default values, that can be overwritten from command line -ARCH=arm -DISTRO=bullseye -BUILD_DIR=$PWD - -# Parse command line to get user configuration -while [ $# -gt 0 ] -do - key="$1" - - case $key in - -h|--help) - show_help - exit 0 - ;; - -a|--arch) - ARCH=$2 - shift - ;; - -b|--build) - BUILD_DIR=$2 - shift - ;; - -d|--distro) - DISTRO=$2 - shift - ;; - -o|--out) - EXTRA_ARGS="$EXTRA_ARGS -serial file:$2" - shift - ;; - -p|--pid) - EXTRA_ARGS="$EXTRA_ARGS -pidfile $2" - shift - ;; - -s|--secureboot) - OVMF_VARS_ORIG="/usr/share/OVMF/OVMF_VARS_4M.ms.fd" - OVMF_VARS="$(basename "${OVMF_VARS_ORIG}")" - cp "${OVMF_VARS_ORIG}" "${OVMF_VARS}" - EXTRA_ARGS="$EXTRA_ARGS -drive if=pflash,format=raw,unit=1,file=${OVMF_VARS}" - ;; - *) - echo "error: invalid parameter '$key', please try '--help' to get list of supported parameters" - exit $ES_BUG - ;; - esac - - shift -done - -eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^DEPLOY_DIR_IMAGE=") -readonly IMAGE_DIR=$DEPLOY_DIR_IMAGE - -readonly ISARROOT="$(dirname "$0")"/.. - -readonly MACHINE_CONF=$ISARROOT/meta-isar/conf/machine/qemu$ARCH.conf -eval "$(egrep 'MACHINE_SERIAL|QEMU_' $MACHINE_CONF |bb2sh)" - -eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_FSTYPES=\|^IMAGE_FULLNAME=\)") -# Take first image type for VM if there are several defined -IMAGE_FSTYPES=$(echo "$IMAGE_FSTYPES" | awk '{print $1}') -case "$IMAGE_FSTYPES" in - ext4) - readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4 - - eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") - eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_DEPLOY_FILE=") - QKERNEL=$IMAGE_DIR/${KERNEL_IMAGE} - QINITRD=/dev/null - [ -n "$INITRD_DEPLOY_FILE" ] && QINITRD=$IMAGE_DIR/${INITRD_DEPLOY_FILE} - if [ "$ARCH" = "riscv64" ]; then - EXTRA_ARGS="$EXTRA_ARGS -device loader,file=$QKERNEL,addr=0x80200000" - QKERNEL="/usr/lib/riscv64-linux-gnu/opensbi/qemu/virt/fw_jump.elf" - fi - EXTRA_ARGS="$EXTRA_ARGS \ - -kernel $QKERNEL \ - -initrd $QINITRD" - KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw $QEMU_KARGS" - ;; - wic) - readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic - EXTRA_ARGS="$EXTRA_ARGS -snapshot" - ;; - *) - echo "IMAGE_FSTYPES \"$IMAGE_FSTYPES\" not supported" - exit 1 - ;; -esac - -QCPU= -[ -n "$QEMU_CPU" ] && QCPU="-cpu $QEMU_CPU" - -start_qemu - -exit $ES_OK -- 2.39.2