From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6969105759827132416 X-Received: by 2002:adf:cd90:: with SMTP id q16mr4773196wrj.113.1622621412464; Wed, 02 Jun 2021 01:10:12 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fe4c:: with SMTP id m12ls5156342wrs.0.gmail; Wed, 02 Jun 2021 01:10:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/IEYRbzBJWxkUOtXpbxUolwxVxMrOoE7XtgOjAUC9OXIUER59rdLM08Fta7jIn4DUgHtm X-Received: by 2002:a05:6000:188d:: with SMTP id a13mr32270341wri.61.1622621411793; Wed, 02 Jun 2021 01:10:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622621411; cv=none; d=google.com; s=arc-20160816; b=o1wso1vbwcXZLhhhyUDpL3vFrZOErvQvlP7VYc47WHlIvBEA87vod0b6Q3SniVkLZE CRZUVmPewXo+KPYwfP35xedDzJsKmDHttNd0/8emDVtk/zgh5jKzGjv3M3Ry1yTTMVRw LbvCXie10sqSK/+0MbyJKYlcE6QY+KgmWGSSZb/BuqOqAgQMJOZVSWPouuWwBZilFdC9 gSpS93J2FhtS8tjYuCT9wqY9ZvYGZ4Q48s673IbHyvLnjvgzeucUHM/x8CY8fIwwqY7a M7QmyEqmjF8QVQGmUV6OaQtrF5yxTsu/azCsPwyTQOnesbLuV8To0l1UadDmDgfi8pGk ngGA== 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=Bgt2UmqqxN8qHbkkGg85NfQO5L6G6KL6L0xhK1WOdzRD0Howj8ae8FDYhRIr+b4UkN etRCaaDyZ+p4t8AIFzkvOoMXzDG4BwwxTLomTPCbk2e/i19q8WJmOoBicOjRmQwfyvq0 SuNM9sLDPf/LP9ltgAdx/VZNp+Aa3FSpjVj23YZcM7f1URIfuz4D88e12unMwwGj14Yi UhWrVA/cZQ2w6oJhIxAQGRdA8dVnv0JdorCeZRxXPdHozZ4wTDFPkvntt8slAqItFce7 0EPpQkGS8SQOaKfBRXKgbEpXE/8rGMWWEX0Rv3X4MA3SFsH/u7ieyOZcevnjZVCk7+vu jinA== 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 s13si374058wrr.5.2021.06.02.01.10.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 02 Jun 2021 01:10:11 -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-160-69-214-37.mgts.dynamic.pppoe.byfly.by [37.214.69.160] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 15289Uv4011199 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 2 Jun 2021 10:10:06 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v8 04/17] start_vm.py: Fix ubuntu image name Date: Wed, 2 Jun 2021 11:09:08 +0300 Message-Id: <20210602080922.16435-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602080922.16435-1-amikan@ilbers.de> References: <20210602080922.16435-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: 744oVJRlye8d 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