From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032205572624613376 X-Received: by 2002:a2e:8753:: with SMTP id q19mr23717783ljj.310.1637312950112; Fri, 19 Nov 2021 01:09:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1251:: with SMTP id h17ls410730ljh.6.gmail; Fri, 19 Nov 2021 01:09:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJwAZQlsV75nihPpcHujl98QxsZi/fmFDA78mf4xEhXgB2fMwOgKyS/+mn8VMxI7jvXgtiYC X-Received: by 2002:a2e:9acf:: with SMTP id p15mr25007399ljj.213.1637312948836; Fri, 19 Nov 2021 01:09:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637312948; cv=none; d=google.com; s=arc-20160816; b=mCWRinLc+ZOQPt5UK/+WyCGqGTbnW7m+FTKldyxSCfCmwKggs6TF+3qFuql4cFW6/b XGFBQxWJcLlXtk3suX7ufgq0xkmKgujdzQZvjW9lmE4EXi2khAHvsBuX6RGdBoP9C3OL 564TMFkVDTQs+BHskUYleZWmOxZy25EqqY1ECWxMrmdZi586PlaWMjQxlIUvAAzBtw3L eWtt3iVhXJgt8rtOlOFJRsczE4kzkerK0kYfH0IuBbYqxfvLc1BUYrkh2Cud6NdgXWKP +05p6UjMF4vma2F/fc7YzFLvkgt6wkZuYcUj7tWDDsNCIuBEFDtBmdbRbelTv8YCBeNW hskg== 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=/zOzWZNwMbJMuQbF1aDeyGHxDHusl7uAIhRe5eD017A=; b=wIwi6BMDIg8od/LXhtkqJH+besW39L8ZARQuwWaxGQbatPnFJYBc+n8MEBaei9mA05 A5PpSNt+SA2Vvb5LD2zai0gAza4beeTVNAuxxIxNPZA9XRdaKila6/8In4Br3yUV4arn ZtQ5FuYE3Jmsyw9pTr/ZJptYT7N50iES2RcgDzacazvRQe2kS5s+bxqZf1212y8EGExn 5LQppYDkRCfbf9qaVFsvFInffKWqNapa/X+yiC3Qb51286Ta+GEJMg/COarv429TEhIu YRQBO75GY5Gl5GSFxIZakeKrC+lIR/2BiM0tt12mQrSZ35YXJNgPQFCgmeLlaTUg7doc Mx2w== 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 r15si107805ljp.1.2021.11.19.01.09.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 01:09:08 -0800 (PST) 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 1AJ996ZF020180 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 10:09:08 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 3/6] start_vm: Use the first image type to start VM Date: Fri, 19 Nov 2021 10:09:03 +0100 Message-Id: <20211119090906.31305-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119090906.31305-1-ubely@ilbers.de> References: <20211119090906.31305-1-ubely@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: 5Hb7rD1EgNLJ 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 28ada302..38355a6a 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" | awk '{print $1}') 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 8f0ccd64..63c90059 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -28,7 +28,7 @@ def format_qemu_cmdline(arch, build, distro, out, pid): 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') base = 'ubuntu' if distro in ['focal', 'bionic'] else 'debian' if image_type == 'ext4-img': -- 2.20.1