From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7007432827793833984 X-Received: by 2002:adf:f911:: with SMTP id b17mr13240797wrr.412.1631545101354; Mon, 13 Sep 2021 07:58:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:7212:: with SMTP id n18ls3200399wmc.1.canary-gmail; Mon, 13 Sep 2021 07:58:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyflxmEOwkBCs7dX/J/OxL/41TDoQyKnEb4udoRbVIDAQz4o0Cw9+WYj6Fxv6XYKWsZe1hD X-Received: by 2002:a05:600c:b47:: with SMTP id k7mr7850937wmr.103.1631545100250; Mon, 13 Sep 2021 07:58:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631545100; cv=none; d=google.com; s=arc-20160816; b=fGmI0NOyVY7UAW847weS4SKvGnHC4Yj2r9XudZsQ9DKccKnQxijSuHfxyjCRQoVJ3v 4SWaJZwKaltJAwJVVzxxQ37ORcs+WvlwcXfaf0otmlGhb8kkHAW8yk1vaFywR7gmJ1Yn 5lyjjhl1TGusCBquxVMqU4Cx7MNTWXxq0qsqTRA0NswoZI5Vk28Bi9aoOX0XjXTTgDzL iXFwxZdNIW2k67ESV7grbaZ4iTvxgJwQCHoDJK2mHrkmIFxI7alMCHwM92yRUR7q74U3 2O+Upn2085zi+TRZ0K4WzWsgEI81Rds74zhxqUAUrdQhWM6GceyhQJxeeY2ZBIDfO+yS HA5A== 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=ayh1Ve8Ka9WtUP4GcWo/tZdzRvMoYFh0I48ahIHINEagqUCi86OJpeQHKiKBO3+I7U Lv7JAocTeOVdm6F4XwZvtkD8r1xC0qWM3I5LzxAsKNTpjxeITTFN5t4SKvd1kDUUAm3z uEUFMhRhvBA6pFLuP7CnI4PA96pfCO01EIP15AWg1GeX1OXlLJzinPZcMsHxDMbvCbwL 0W5YUBSI2Fd2VMlDyocNyE0F36l2BQeKN0IKQlRnQdxENI3OmbNmB6ouPaTON7SAJqmN e3AkpdBW+hrDUcwy3qBuz7kKWC7xdUnYzLX79Y2KkMh7EO+oAqneSXdhDJO5lZ0Nybjn uHSA== 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 f20si66092wmj.3.2021.09.13.07.58.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Sep 2021 07:58:20 -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 18DEwA9l009612 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 13 Sep 2021 16:58:17 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 3/5] start_vm: Use the first image type to start VM Date: Mon, 13 Sep 2021 16:58:08 +0200 Message-Id: <20210913145810.26394-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210913145810.26394-1-ubely@ilbers.de> References: <20210913145810.26394-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: wZNy+3IZySix 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