From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a2e:9999:: with SMTP id w25mr4004794lji.359.1631781199221; Thu, 16 Sep 2021 01:33:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8945:: with SMTP id b5ls585744ljk.8.gmail; Thu, 16 Sep 2021 01:33:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUzudcENjvT5guGcy1UEwsNvdm4zHp0LQru8yxYoBHm3Bz4is0Q/KKqPUFJZDvAOMkjqQm X-Received: by 2002:a2e:9f51:: with SMTP id v17mr4057688ljk.130.1631781198221; Thu, 16 Sep 2021 01:33:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631781198; cv=none; d=google.com; s=arc-20160816; b=XpUM8ZF8qERnKdH1lXVL40G+1xLbnt2nrR+QV92tEhz+dAWc0ip338V1oKlCWVv5/o iw4RTx5usJMw1zrUyubd8TggJCfoOmJDJNu+RrftrBmK6POmqyzVBp850h5v3F69YcNN /+VFZGXyO8i/AI9Txo2jpDqlB4n+d80gLBzOnYj50lpL7B2alsaEUixeinIizdTF609w FewvundQrWSnQbLjNL6AWCcmKW94ze/SU9xynwTm0KkgL4bA6VznyaB8feSSDLxkWudD jBEyrlYnLrdu0mfUxJiq9wXX3Xz39WRX8G/f/b05KKcgvRQSQ6oXVkbt3hzczOkp7dW0 JriA== 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=x7ADRfPjweP4yL2Hk4ZItdHzCQUd7RokGnas5yfCaolUQ6MNM898YAc4nZMbx0qrKO +N+PmKUa89IyN30MhD7YNC420oCXFP5S8vvqXpJpqi1M1l2T7wkdJE6aZ9oMroteJ283 sdwLfom7Q1xSMly42ipzbs/MG5RyJp9OOLcW24j1TEnMQvbOxRapwbj6RE6NNkL3V5mM k3LnMlkVoC8vs8FnELaH6LUJmhTMYeyzpBKuLEjUMJphBOWh/xuUWu1FpyPxx3yeE280 tHSmp7X9KPvzaCUjtbU8RBcjXX9W5AUQbrNiPQ9tBaQiZz7Sb6fF9AgWgtdocqcM0yq1 IAeg== 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 g11si311280lfr.3.2021.09.16.01.33.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Sep 2021 01:33:18 -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 18G8X2xH021529 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Sep 2021 10:33:15 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v11 04/16] start_vm.py: Fix ubuntu image name Date: Thu, 16 Sep 2021 11:32:41 +0300 Message-Id: <20210916083253.53037-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916083253.53037-1-amikan@ilbers.de> References: <20210916083253.53037-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: P8yAHyv9xZPi 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