From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6969105759827132416 X-Received: by 2002:a1c:6a16:: with SMTP id f22mr7991319wmc.53.1625052570793; Wed, 30 Jun 2021 04:29:30 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b14:: with SMTP id m20ls1009137wms.2.gmail; Wed, 30 Jun 2021 04:29:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjbosMSlvI8Htfg7p/vTj/8vyT82e8iC9lLKiLzmvtv/6clHw4pWZ8I3YrVZ6v96pD3LZ8 X-Received: by 2002:a05:600c:3542:: with SMTP id i2mr24193719wmq.100.1625052570081; Wed, 30 Jun 2021 04:29:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625052570; cv=none; d=google.com; s=arc-20160816; b=d7V4+JXhG8ZimIUxBvDSBsRjDOUqsNOaHQodv4ouu2pgZmmXkCYcAa5WM5gyuPuWZs she6SKB01hfaEqF2mBKNBaDSJ89JY/AumWXVhATVSRTc/GnpJCrq8EdPD3ASyqiH9g5L beBCCeWMnpvX965ZT3HwrWwGfsXTY5u7bvVpBcMuerN4zHCJAm1PXOLuAu2/ZTeJCIHN 3KQp6qKt6YdA5zeGZVzsKkjyCEd1beSFy2Pw38PGw5tJYNLfm/ZFq9sfiDJPCXjulCmE 8rWqGE88s8YDlpVlsGYCgSTO/YJZYCeL4ejUH2oUjGbs5jxG7vEif1sjOOsdTcN704qo OJPw== 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=YEnDZYmzjVQ3LnQQ0H0JS4t+q3Fh1HoQnX6zSoUFQA/gzYlAMnbl8j8TZL65lzmjMd yP4hXCJ4GKZY7ic+MG1nM8iijVjFevg/kHcuAALsmwc98RtqQ+sxSSR3oerMFsRlbVBM s8jHTyh3ERE0MI4phtWJAF0/NNSzg3Xq6kddY8BbxzIUwStw1LOghGO1YeVEt/G6vhM+ 5EjeP/PijhviFqv9pA7CJckImRw8/N+wGFNr/UyuRSOM/QbHRo3GNNgLiOURH6izWrO4 Zc36FcOYtKVl4xqVHOEtAcd/aEg1Z8YGBqrG+uRoVSToKSmWkPdjF4yVX5EeHD4UpgFl N03Q== 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 192si212020wma.3.2021.06.30.04.29.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jun 2021 04:29:30 -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-249-65-214-37.mgts.dynamic.pppoe.byfly.by [37.214.65.249] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 15UBTMJL007380 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 30 Jun 2021 13:29:29 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v9 04/17] start_vm.py: Fix ubuntu image name Date: Wed, 30 Jun 2021 14:28:56 +0300 Message-Id: <20210630112909.87092-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210630112909.87092-1-amikan@ilbers.de> References: <20210630112909.87092-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: PDhpOJlMP7v4 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