From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7012879449257410560 X-Received: by 2002:a05:6512:3996:: with SMTP id j22mr32249904lfu.637.1637313304415; Fri, 19 Nov 2021 01:15:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3499:: with SMTP id v25ls64298lfr.0.gmail; Fri, 19 Nov 2021 01:15:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6Bt7mji54nMSDn8GmqARYgqND/ieKtqGlSz9Ehf5DXWqeNlxmJZc3pYJUC9a8kvhQyWdC X-Received: by 2002:ac2:5d46:: with SMTP id w6mr29329709lfd.15.1637313303095; Fri, 19 Nov 2021 01:15:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637313303; cv=none; d=google.com; s=arc-20160816; b=cuG5GgKMhRzvCrKPPxfIlqWS3SHo35jLJSrqDFZWgoooTltwniFImarPzItm1/P694 awUiwk7Nyp2+zSyd6p/xwlRKYUl40UbQEB5eFHoTUCo5GbFE5GXJwPHgu9iS476Nd7+R V3h9N7xZJX7Mkci/Gm71iMRN8gwgneTkfL3Gvk2fL8K4ybKoTE1JpxN5Z7+EgaCYwBsL FwTR61e8daFJ7e2SqGOTuPfDoD2hiNjKMFPJl53vPdsVU9qxG4V5/JQ/Q78x21t85YpV Z8qNJ+zQ3ANiWagW/AAiYSlSN20hOBOUbd3Kf0CYCIXNa2JTue9UW/33uJNT4LAy93Dm noCA== 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=Ft3gvDQMuvAsj80C+1tA7+nT0vDNc1GXRULF7O0FJRzfNITfdChl/WwJQj9WylFMMk LRcE+++4rGi4dy9QX2kH1adLb0aRFk2pZfcubACEcTCkwfhOyLM2HPsTS+mCuUZq/ktU D/3/gSEbQGiQwDCAnqIMxICiBs+84imPMTXvwYktRZ8W0OrIRBYUrbNmAzszaD6ybfbJ MIwBh6lx5PJVCf0L9fR/LOCB+tTtVkFiAM93ursMsESsKJp1yDgoZvFZvQOUHwHsM+nm hkmexVAra8e/W9FRyAbd8u9B57NJcXN9Eoi0M4FMZs8osrS2CJlMCfAzzgNlSetihy1x K06g== 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 d8si131113lfv.13.2021.11.19.01.15.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 01:15:03 -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 1AJ9F0uq020418 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 10:15:02 +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:14:57 +0100 Message-Id: <20211119091500.12341-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119091500.12341-1-ubely@ilbers.de> References: <20211119091500.12341-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: 3ECNv1lPVrtR 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