From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6953642757724307456 X-Received: by 2002:adf:e10f:: with SMTP id t15mr42938233wrz.331.1619704384574; Thu, 29 Apr 2021 06:53:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:64c2:: with SMTP id y185ls4500813wmb.2.canary-gmail; Thu, 29 Apr 2021 06:53:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfS4Dh0wRzH87wxAe1IKr7ZNuFbYngyHlaecrA2xrO+XE0AxAZiuHOsuXaEEWADbkKluhU X-Received: by 2002:a1c:dc41:: with SMTP id t62mr10673873wmg.14.1619704383706; Thu, 29 Apr 2021 06:53:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619704383; cv=none; d=google.com; s=arc-20160816; b=vt/guNUwOZrlhmk3ZD95ehWMx8KAmnBqqMf7wiY81BHgTvnPQmnU99mOmZt7WBmxeB Suj6VlXtFDhp1i9r+2WrXxrtkewOrFYK+exXNQZKZsCNQyaWmfEhA0NltcZVt3MK4PEd uqO/v5ze/ZgQ57IJoDXFG12ok53sU4NxltpoAAn74Z7F0ao6BRFqs0h53dfrXga+HVJd M7TFhjFX/WYJb253hQnJYT+6SFqly3qSyxCdI7h7yFPnE1G9YkdRp8PKe+JN4bpskUxE z0PxIAKwO7T6qxxKpOw2fZtMoT7DPoEx4bP79mzP9eNyTrMhbjLf4X71+m940V4FKOeb MERg== 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=SU696leEGxH4reDW0grQjjNv8ge/oZJdaLbTcmU5OSCs+O0yovl4yOJMPYZnjP1NV0 opeKLeKLXE6pqZ8ip97RHL9ANf5gca6fEMcQ2imAeioFgTTxPdt+qd6VWOT6WVupDCcD SqZgU63CKauhVBan6+iR4VUC0b2TRBBaHNkcowclrICugS57LbjUiW8rAbqvGfj8a+3Y HMLn8W1LoRW7aHNLfwJyhEA1P2mOKHkRuTVnD+KoCKFtCof8ur2OBbbNZ36mIr/FIKIm +n25eYq8suEsTF4Zj5iIohnkTu+I5cj2d6mEtimSJRHmn2Vi5NUAtxLYxRXtaO/1mug/ GdkA== 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 5si177937wrj.4.2021.04.29.06.53.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Apr 2021 06:53:03 -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-97-79-214-37.mgts.dynamic.pppoe.byfly.by [37.214.79.97] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 13TDqsYm029186 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Apr 2021 15:53:02 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 04/15] start_vm.py: Fix ubuntu image name Date: Thu, 29 Apr 2021 16:52:35 +0300 Message-Id: <20210429135246.78792-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210429135246.78792-1-amikan@ilbers.de> References: <20210429135246.78792-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: RLM3FXE1NkvM 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