From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6953642757724307456 X-Received: by 2002:a2e:97d7:: with SMTP id m23mr25461450ljj.397.1621104179142; Sat, 15 May 2021 11:42:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1409:: with SMTP id u9ls2199072lje.1.gmail; Sat, 15 May 2021 11:42:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0Ak0s/9viEB15lsCBtvVCC5alkkwpLSi+OmagSqZf4iHkL2FpIJ3ICCRQd8WlCMzPD3dk X-Received: by 2002:a2e:9a4b:: with SMTP id k11mr41217820ljj.100.1621104178169; Sat, 15 May 2021 11:42:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621104178; cv=none; d=google.com; s=arc-20160816; b=fj5JaUTidrYZxI0m05VSGrRIlXoV2wca57pBDq7pK4qvmJt+UAbzdDSWeOw/epb/W1 5dGasa1198YFhdUj8I1eKPC6VlWtU/aUT84xdbeHNkA9fXhDQeGQe9DdRsjFWe75E7mq P2ZkSyx701u/35Wf+qbp4IQy1/lCl8klLR3IvRzIo30DOpQQ+6ahuiz/gi1GRbWxDNqF +MuZIhtWOS8jTnzSlTYoDbb0cHjOlqjWe9PiCfis2zyGipti5a4NhbMa+B1KjPL9nFVd 9EqQlBSkpwdmS6nX0Ah3qgvzNk/v1U5O7+2AATtPGg58h0KT4VvHvCWQ8toDLMSOYJ9Q W77w== 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=pIGotJUKbQWmlCxWPbuP3dC3EFYzogjw/7i2+frQWL6xeZmdB9W4CIPSAoKwqIkQzN qncN8r9F9Dwk7szHx3LxPw2oCQ5vXdNSos91PoCVoB1bPYZGKJRSPdrRp5icSP6W75qo 9aKkgs6s5j7wVDioi/XLMgCjg7ao8v1XqCE3pWcaUq9lK5oP6Yx/Pqmr6TNSUTS4hJ1N aA6QYAtyIWUVWERsOrKeBniZBP7PXW2ARy7Kc+/0353tXOEHvZyg4h1gBCSOa4udJmyH 9AJXIcFFDtlHFCYcENfB8+bWYtz4ZNvJ4K/jeD2UP43W7R9KoYpnKCMMn0WV5hGV27U3 QDpQ== 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 k35si201935lfv.3.2021.05.15.11.42.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 May 2021 11:42:58 -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-205-68-214-37.mgts.dynamic.pppoe.byfly.by [37.214.68.205] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 14FIgisd003013 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 15 May 2021 20:42:56 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v7 04/17] start_vm.py: Fix ubuntu image name Date: Sat, 15 May 2021 21:42:22 +0300 Message-Id: <20210515184235.3048943-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210515184235.3048943-1-amikan@ilbers.de> References: <20210515184235.3048943-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: R8wPAdt+Z59r 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