From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a17:906:cc57:: with SMTP id mm23mr13488894ejb.540.1631898061757; Fri, 17 Sep 2021 10:01:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:254d:: with SMTP id l13ls2061196edb.3.gmail; Fri, 17 Sep 2021 10:01:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxXdsq+R6dOSDa+XIR2ZHt8E33cePvqxevLZrwQWHbu6E6DA5DssxAtBATjsw/a/AofbLL X-Received: by 2002:a50:9d44:: with SMTP id j4mr5273270edk.173.1631898060740; Fri, 17 Sep 2021 10:01:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631898060; cv=none; d=google.com; s=arc-20160816; b=rqzCMKyNLXkJjY1MP/elnW4CEAyKOxrFAu4h/1xRvuvM1cpFEq6xTSV5eGpCIHa7U1 jzaRhgFpgrgLnX720i3y9Po3KjwTxds4QhpJ7t950JLhyaCwKr7L07HKrjWJBBsa4XZO wbIZoJEWorkY5JTeWtfZt3nFfqM7UMhUxdwsVttroozwWaZ6KqouS2nKk7A03m4rZJ88 cuU65t82PmXhAceATaGX7Q7bIK1yrKv7SKkQVel2TU59jBSfNlDTqDEm+2tkoiarQ+BF RZLdG1vO5KSwIS9QG2EmAGMBudCneVEUQuCHpUQN6kKtKOZy5ee4doJ7ifR1i3vmWNih 5YZQ== 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=0BsMTg1AmxlFkfd7jjdjEWLLvUKbV2E2R8piFu1DTI9puG0k8kYdPON2t6t8Pj1bFZ +vuKROeYGXHopIp1yqUZ272BCdnSYsTQ+/wSPTiMlxpXM+KfkEAmVyKlT0EgGAAtkORP c5H7Sjkg82xhIXLH9oN42M05MQ+HKi9/R6/d418XuZD7nL5Ns7gU4ZDgu/SVuu4nh/8z hxrjB/OmNVu/onYz2JE2OI8QYqXPddm7AHolAec+/98imMynpLud9Vj4rogvH6oGGYgW wYB+YrUHg479w5q0enxDg80ODnJiPxH2u9TcHn4S0+ECbtT5CEV9Gfv1c2AdLB0YqCeQ FTOg== 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 w3si193698edd.2.2021.09.17.10.01.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Sep 2021 10:01:00 -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-240-58-214-37.mgts.dynamic.pppoe.byfly.by [37.214.58.240] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18HH0iN2028039 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Sep 2021 19:00:58 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v12 04/16] start_vm.py: Fix ubuntu image name Date: Fri, 17 Sep 2021 20:00:21 +0300 Message-Id: <20210917170033.74797-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210917170033.74797-1-amikan@ilbers.de> References: <20210917170033.74797-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Dv5nwy+bK5ae 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