From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6953642757724307456 X-Received: by 2002:a1c:6757:: with SMTP id b84mr19666825wmc.58.1620542562224; Sat, 08 May 2021 23:42:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6da1:: with SMTP id u1ls5210687wrs.1.gmail; Sat, 08 May 2021 23:42:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBGltZ/DSWKcQoFXCHWqfrm0RRQjKCJHYOOuCQeazw3S/IqxHw+fi8UA9ol6cvWo16ni1H X-Received: by 2002:adf:f5c6:: with SMTP id k6mr24372912wrp.338.1620542561553; Sat, 08 May 2021 23:42:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620542561; cv=none; d=google.com; s=arc-20160816; b=rqcthT8pPJ1Ak5x2WDXslue6uuXq04fapL/+FkX1MVUIVPft7kHi6/VBUy/eAmNpEr J5lq9OWIcEgN9bD1PZeam8Wm+TkPdKvnvQms71DYUtP6T7cQfTu1uWx8zaiXdDVdPDdv MY0kY8Jw9t3xgO7OnMLk9+Sh1n28VdUMH/G1Hf4FKHltIVNrTHMJjGOX+lR1hKz22iOY jT7PMBC2+19S/m1u9DxK6IuJG+Pl8Uh0TzgZSS6Yi/9/fdL+UQPkuKz5n+L0z9bja3yy QDRC6DOIlFowjRgwNAGwf5Eq7+y03Xo/ph/bCQe/etflaGROd8qYKBcWTmpqC7PwGDYk npWw== 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=HQAJL4ZpCEqHsD5VgRWcT5/MWHRkTXXF21vAdpNYrQ0=; b=07EQYNS19TBL3r7Cm/iFRsi/94v1Ua4WK6RXaof4uZmIkARLAFJOf/lVJx5m2Zkx2U 1gz03Az2M/BGD/ywxq4ytN5kobMXFb2jYw83GqFZSFpM0gZBIatbVVdmSXKKeBcOX+Zi e2XKmyqQ9+kik3LamP/Id8CG56Wpgn/CI3u956RyecwMMhAhIOuMZrU+3man7RHxBYk7 mFBRREmJadHcrR8d2PeCfw1r0kv10wcyQCiIlK9E9ZfqBIwGlO6YGsNid6nnr/f5vQU9 AGldewuggJ/03+WlIhgAiZam0pLmDkcp3hZUlyD0w9qSfUSJmWO79V8kRJ2EdfEUGJVL JrAg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id x11si601281wrn.1.2021.05.08.23.42.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 May 2021 23:42:41 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-99-50-214-37.mgts.dynamic.pppoe.byfly.by [37.214.50.99] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1496gViI007988 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sun, 9 May 2021 08:42:40 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 04/15] start_vm.py: Fix ubuntu image name Date: Sun, 9 May 2021 09:42:13 +0300 Message-Id: <20210509064224.96072-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210509064224.96072-1-amikan@ilbers.de> References: <20210509064224.96072-1-amikan@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: 20Lg7YZTeLZD Choose 'ubuntu' base name for 'focal' target, not 'debian'. Signed-off-by: Anton Mikanovich --- testsuite/start_vm.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index face747..8f0ccd6 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -30,8 +30,9 @@ def format_qemu_cmdline(arch, build, distro, out, pid): image_type = get_bitbake_var(bb_output, 'IMAGE_TYPE') 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': - rootfs_image = 'isar-image-base-debian-' + distro + '-qemu' + arch + '.ext4.img' + rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4.img' kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE') initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE') @@ -47,7 +48,7 @@ def format_qemu_cmdline(arch, build, distro, out, pid): extra_args = ['-kernel', kernel_image, '-initrd', initrd_image] extra_args.extend(kargs) elif image_type == 'wic-img': - rootfs_image = 'isar-image-base-debian-' + distro + '-qemu' + arch + '.wic.img' + rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic.img' extra_args = ['-snapshot'] else: raise ValueError('Invalid image type: ' + str(image_type)) -- 2.25.1