From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a1c:f31a:: with SMTP id q26mr14593465wmq.159.1632740543391; Mon, 27 Sep 2021 04:02:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a285:: with SMTP id s5ls583543wra.1.gmail; Mon, 27 Sep 2021 04:02:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTRRmnCKhPk2CVhJ1sAdrCEqPGGJCsF1vTf8mWuhj8YkxM+ns68GFjRygQuv+cXiITBcYc X-Received: by 2002:adf:f0c7:: with SMTP id x7mr27062272wro.432.1632740542526; Mon, 27 Sep 2021 04:02:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632740542; cv=none; d=google.com; s=arc-20160816; b=HbScSoMzbxvY+uUZ+QG/FEOHNRb3yeCSiMEbQDGDWKD4iy8UVshRaVX6BN0hDxLpjh eG5zV0nKWgadtUJbKmAD+bbFSCadnGmIA/y50o9hLxIPP2k4JcXxsAy2ZwcPCVjJPVRy oTId7BKO3ALvbMf4cgzrghmfqYPz0vnpyyZw6L9Y8Qc/saz9sAUqnSSv6BJCHQ1HVaGN FT+PkMQLtWZDCm5NYFopRkJChRPc+uB0s9T9lWXdiwi1KZegBNGS7st7fShoWsp8Ox5R p+bkfXayeUfcS8RFGRsvryPNxngoHmkCGt2NdpN483+z1iOM3i21/80bp62OImoBCnwc rDoQ== 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=KQKWIFFs9KS1u6NNp/VyQGXVn7Ua7OPd4JyhBPWu1NtYV9hFqLofzSJrBcvbnzfviv gqJZh9nXCBBVsaugvle94iKDC5K/bjoE0MgAW8omOxxisfToM8MQgj1+tWKMPLvVIDB/ 5mHp+bzNxbtQfTtzHeqrx4LP7QrWTWY7rpk9to9bztq0EbOpWTScykp1HgDwW8Niq0Sz m7KKyvp+t1x4vCz2cUjm96JAROvdk1F1T0KJ8oShaK7Y1qVgaXol1Gti+Jt5nZ8rI89L Cak1CdZTErocEQG3cBo3XZi2dr4Ea7Law8EQYi7gCz0YpQLHoMW1T+0sO8PJHJMff5qQ WMQQ== 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 i7si1072016wrn.2.2021.09.27.04.02.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Sep 2021 04:02:22 -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-59-42-214-37.mgts.dynamic.pppoe.byfly.by [37.214.42.59] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18RB25dn004256 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Sep 2021 13:02:19 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v13 04/16] start_vm.py: Fix ubuntu image name Date: Mon, 27 Sep 2021 14:01:44 +0300 Message-Id: <20210927110157.11291-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210927110157.11291-1-amikan@ilbers.de> References: <20210927110157.11291-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: NcsmcQSscQqu 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