From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7012879449257410560 X-Received: by 2002:a2e:85c2:: with SMTP id h2mr4459542ljj.367.1632813243426; Tue, 28 Sep 2021 00:14:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:881:: with SMTP id d1ls4450393ljq.11.gmail; Tue, 28 Sep 2021 00:14:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzggiORcnh2jpjRh18J3TyM8Ui4/waghUuJnN8eUx++sMc/VN51VIChWu49o8WHHeknudCh X-Received: by 2002:a2e:2f04:: with SMTP id v4mr4505574ljv.152.1632813242262; Tue, 28 Sep 2021 00:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632813242; cv=none; d=google.com; s=arc-20160816; b=yRPGHfTQ8Ak2BD6xIlx6cgDus8scTmtKxWJEH1pwKquO30CzuhLNlmtj7Z6CyoKmpU ZWTcQNHXOXnnyxHEE0FUMd2nsCQgOXO0P03tlwYrfZoOfLzdXoWlvZHjReVtJIKvdEKm mLr7pPmZ65AfZpYR6KnEmVfZBJKsUSezjBp3agO1TooL6gNLBh0sPtQKwGq4PbROpF/6 z8hoLAAnoE91ZbWznlIf4Z3tdBXImBcbQgBZo3ddUXzOM7LN9mpCggMfeJoue1HsnC+7 ckns055jrx2CHGuAEYM0kEoDnHNYZmeNPq0YLpfteduVzBvlaY5bK3FVJ6l8f7MPo0pa 34yw== 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:to:from; bh=OdSML9WVMaUVEP8/TF7fSP7yL8lzF8To8a7ANxVt6TU=; b=GRUISI5zFY3yIt2AMoO4UzAXB1FlIWUerHbcr0ZGL5IIGQnUEiqyoeLr3CMV4z9Puw AR1gMq4o+tR9jP9Mqi9oqH9PmTILYWG7YudS8j85CbxYWQVg6th8+RrdpRb6VffnjJox yxYEShXY86g40iJhjpHuxC1kMoMdYfvS92n2RYX0xFCQtDBpSL51f8RWgwRCVzWpSfzM rD1bgECuh3DEC4z7rZn7WO8D14OyBIZE++jlS++1TJwkpdZJWyCqvbLszzk1EZ3cPeV+ iu23H/ab46+J2ZOzl2S8/OtCt9CFxK74ySeBmzAhDQt3W9gezT1MKF1giw01vhWjkKI3 NUsw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o4si1308877ljj.3.2021.09.28.00.14.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Sep 2021 00:14:02 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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) with ESMTPSA id 18S7Dqmi008903 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 28 Sep 2021 09:13:59 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 3/5] start_vm: Use the first image type to start VM Date: Tue, 28 Sep 2021 09:13:50 +0200 Message-Id: <20210928071352.31382-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210928071352.31382-1-ubely@ilbers.de> References: <20210928071352.31382-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: cpma3DhfPf6a If there are several image types listed in IMAGE_TYPE, we need to use the only to start VM. Let first one be the default. Signed-off-by: Uladzimir Bely --- scripts/start_vm | 2 ++ testsuite/start_vm.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/start_vm b/scripts/start_vm index 28ada30..77c4244 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -110,6 +110,8 @@ 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_TYPE=\|^IMAGE_FULLNAME=\)") +# Take first image type for VM if there are several defined +IMAGE_TYPE=$(echo "$IMAGE_TYPE" | sed -e 's/\s.*$//') case "$IMAGE_TYPE" in ext4-img) readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index a3e32ac..06fc935 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -28,7 +28,7 @@ def format_qemu_cmdline(arch, build, distro): extra_args = '' cpu = [''] - image_type = get_bitbake_var(bb_output, 'IMAGE_TYPE') + image_type = get_bitbake_var(bb_output, 'IMAGE_TYPE').split()[0] deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE') if image_type == 'ext4-img': rootfs_image = 'isar-image-base-debian-' + distro + '-qemu' + arch + '.ext4.img' -- 2.20.1