From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6990633379674718208 X-Received: by 2002:a05:6512:36d1:: with SMTP id e17mr1108362lfs.145.1627633674179; Fri, 30 Jul 2021 01:27:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls529096lfi.2.gmail; Fri, 30 Jul 2021 01:27:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxA95oM0d0NCezp1uGNbQwrvxgUI6CJzXp1T66rHSlZalyTfi3UCzzwpg5HVoMHyNM3Kfn2 X-Received: by 2002:a19:7703:: with SMTP id s3mr1115566lfc.345.1627633673199; Fri, 30 Jul 2021 01:27:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627633673; cv=none; d=google.com; s=arc-20160816; b=dQ62r79Jw87gah0prjM0QKA7xzdrq9R7Cr2tFpZq4OefVOUfAkboKM32bRxrkbIBdI Xcs2uWv6HLQWBmWckjOEnLy0DUFKzrZd7OMnWeU+9VMhV+x8LNnndF8dBXeTiKAG+8Im Dm+HuSyKllP/9fK+B3dM8ZLrKz9d4IhNYXIF1pkrf8x9F3916l1KrSFzQ1PgJAzUO/VH c4bC3pToDD+Kw8VkuR9fE47ZdZsJizGTxTSQpJpnsNffv+0WFK2oeG0S1nI2QG97s2gk fY94BzfShTA+nTz7w2SrIJvlt4xea6V3M/XePd9Zqa9Gb9X8YL3QgCRnwT9eSmKNLsET DLIA== 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=yTfAIoQGUaHpN5SoN3lRJDTe27Nq/tRfjRBnkCb9NaFurtJL9KSF8FNx5yRM7yU/Aa GdNezYGo4eEA4GtP6c1T4xqdnHeNXWgAVV2AZ0Tkg6xKRZHBQtPlIw98yQB+1Wc7ZVoR HZXaFIM1z4uFpa2kUazcf8e/4o2q/gCZGPrIHZERiZLFZQUeSg+jPJgYdz7JyvsKKA7N 7uOTn7vmM198wP3NpaUudj//5shi3ESDNM2YsNds+Dr5dNXxCM9fb7e9HI0QZFu00j1f 3CMIUCFYw0QH3nST8DarbFgoxa21dfbdYIvDH61pSqVdrDBt8hey0vf3SeirB6ZilRaF vo4Q== 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 d6si47559lfk.4.2021.07.30.01.27.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 30 Jul 2021 01:27:53 -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-88-30-214-37.mgts.dynamic.pppoe.byfly.by [37.214.30.88] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16U8RkvM008721 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Jul 2021 10:27:52 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v10 04/17] start_vm.py: Fix ubuntu image name Date: Fri, 30 Jul 2021 11:27:26 +0300 Message-Id: <20210730082739.15042-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210730082739.15042-1-amikan@ilbers.de> References: <20210730082739.15042-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: HQ0h09AMmEhr 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