From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7008446828784910336 X-Received: by 2002:a05:651c:1795:: with SMTP id bn21mr7096646ljb.525.1633020357842; Thu, 30 Sep 2021 09:45:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:240d:: with SMTP id k13ls1411951ljk.3.gmail; Thu, 30 Sep 2021 09:45:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykv8NAEI9EAErdM+CtwPJtSfVTIB5c2UgD5E5SnP/gSUswm/jdZnBgW5ZY9doa7JbW0dM9 X-Received: by 2002:a2e:70a:: with SMTP id 10mr4227359ljh.89.1633020356660; Thu, 30 Sep 2021 09:45:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633020356; cv=none; d=google.com; s=arc-20160816; b=kdctKmgATfZuBMEgf8eUEzl5q+rd5JAQxpSBNOkHvktZHk6u7qM5HdyGabAWHjSN6d Hvo5gUem/asFgRYTopDWVCJwrW7vsw2tOzduaCzQYG6T2/jYSLKRkncqNQITQFiG93Ig SwFZbL9f5K+VWVOMUz5Yvf/N2ugYfBBsJNTr+cMtL6URT5jmPHHm5pYzRqz3tf92bH+c jRNg60/mROMqjpNGIw6SP/FVBppzcW/HTfd0rLzlQghyDXhbZqDLIIZhEWTgekRMh8fU 4tBmKyW+eRbpoH4zMoTG7zvEmv09a0ZdnH2gYB6Nbpqud4aSv6qt2Smg828Fk68vT86N vKyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=B4BmW5V+6r+K2JON5WLtwZXYHH2+pkVOqWCWfenc+lM=; b=YSC11erUqyuDXLss5XZl8Wil5xr7V4a/g/YqftC2UobGGhLznHJ3Av7LjQZczQPNZl NACGnavuc3QNlzanLJnDgxVhbUYF++PEWACm1e24os5sg1JRs6HGOANRk6QWpxRinbrP hfnye+jyeSEG5vZhvBuZQE5hjPdyu1FxRbfqYiBQsLyt1r8ANDNG75TV56DDSADrKJOC uGGdWD6mIPBThJosNFLBJ05k29RUv2xKXSkCfPmQ/kmmtu9XpQnojc7dZcrJ3ICgeTf6 v/tmWpl0uBxWJNwHeWkQkT4w3Ne6I02iZvDV6rzDbPgP43qyYZ0ONJFTVBRKLaK/UgzK 4wpw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) smtp.mailfrom=anton.mikanovich@promwad.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=promwad.com Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id l5si170024lfe.6.2021.09.30.09.45.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Sep 2021 09:45:56 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=softfail (google.com: domain of transitioning anton.mikanovich@promwad.com does not designate 85.214.156.166 as permitted sender) smtp.mailfrom=anton.mikanovich@promwad.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=promwad.com Received: from ws-323.promwad.corp (leased-line-st-87-252-252-30.telecom.by [87.252.252.30]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18UGjhuc018892 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=NOT); Thu, 30 Sep 2021 18:45:54 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v14 04/16] start_vm.py: Fix ubuntu image name Date: Thu, 30 Sep 2021 19:45:29 +0300 Message-Id: <1633020341-26062-5-git-send-email-anton.mikanovich@promwad.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1633020341-26062-1-git-send-email-anton.mikanovich@promwad.com> References: <1633020341-26062-1-git-send-email-anton.mikanovich@promwad.com> X-TUID: l5bfljtcp6zJ From: Anton Mikanovich 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.7.4