From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7091359752162115584 X-Received: by 2002:a2e:878d:0:b0:24f:2bf2:5a79 with SMTP id n13-20020a2e878d000000b0024f2bf25a79mr2347734lji.497.1651085860061; Wed, 27 Apr 2022 11:57:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1507:b0:24f:25b5:39ce with SMTP id e7-20020a05651c150700b0024f25b539cels996037ljf.6.gmail; Wed, 27 Apr 2022 11:57:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztiBrAjn2oHdqXR+FRnO+z+TIozVLaK/PyPlgIoSUkfPGB0BC5acNJ5iJftqXzgiqXxOwH X-Received: by 2002:a2e:a782:0:b0:24f:2648:9ec6 with SMTP id c2-20020a2ea782000000b0024f26489ec6mr4245676ljf.104.1651085858934; Wed, 27 Apr 2022 11:57:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651085858; cv=none; d=google.com; s=arc-20160816; b=WMSrNPqZg6zbxrZDwYv0iwlPhcQDMv2aunhlRVLgMZUqibE7WjVCJ53T8Ynf+6jWrj D7Lp9XUbUahJIhQq7x6Yv41r6A6WfLK2uQlFKuIlCbq4Dohnq9kVQEu+ZtNXHGJ6+sPf Ia5XxT2eRp+60A0SUuaG0g9rkjViQ2Jtp/gYS+CYNuFlT3FoolUTA6I8snsnjbi8l/J+ LNcrdm5MckuUkJzXSQDB+svq95DBUAPgW4XiikLr0lhYJLhJerBUht9tFwlqhz/nUYtk sQWZtftrXE5/jrRjQAAX6HaBHnOz/ERDWKBrOJgTFrPcEB9BG/ptEuUDt4Jvsd9bWFXU HVgA== 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=g9DDjMwVrnuPfm8ci0CPvrTtMT8o3HdmzBJBGVWL26g=; b=hqZ5loetMEzb5jZMkhcZIsWO6GN+fAnofPxsE2z20GJZzkMAt1p4RI75IpESSNxMTL h9OSzZ1H7k9J3LcFgzTYheJwYKvkvKdZzCoMGJd7VBzEsMs3QV8i8E+ipTBWRFic54TK IWW9WDR/whgQyuccYov0GLxHI5vo062rIqU2ffoGBLR69UX8PgLatSoE4bMST+XMifKt mMIIsfy47SdUlgH+YfzDZ+k25fZQnYPgNIv6I5qBnpHwTkYjVRW1GeUgeU5DMMbM5Eil MVXpukdfmKdvCKFy0y2ED1qV5jueq+fjHBlo3WHEp5fDADL2mJlQrGpmi4k1cReC6ALP IJ5A== 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 v4-20020a2e7a04000000b0024eee872899si102401ljc.0.2022.04.27.11.57.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Apr 2022 11:57:38 -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-48-45-214-37.mgts.dynamic.pppoe.byfly.by [37.214.45.48] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 23RIvX6Y003696 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 Apr 2022 20:57:36 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Anton Mikanovich Subject: [PATCH 1/2] start_vm: update image types checking Date: Wed, 27 Apr 2022 21:57:25 +0300 Message-Id: <20220427185726.14022-2-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220427185726.14022-1-amikan@ilbers.de> References: <20220427185726.14022-1-amikan@ilbers.de> 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: dk2jhptvq/j4 Image types checking in start_vm should be aligned with code updates. Signed-off-by: Anton Mikanovich --- scripts/start_vm | 8 ++++---- testsuite/start_vm.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/start_vm b/scripts/start_vm index c114d86..8876e53 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -113,8 +113,8 @@ eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_FSTYPES= # Take first image type for VM if there are several defined IMAGE_FSTYPES=$(echo "$IMAGE_FSTYPES" | awk '{print $1}') case "$IMAGE_FSTYPES" in - ext4-img) - readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img + ext4) + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4 eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") @@ -130,8 +130,8 @@ case "$IMAGE_FSTYPES" in -initrd $QINITRD" KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw $QEMU_KARGS" ;; - wic-img) - readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic.img + wic) + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic EXTRA_ARGS="$EXTRA_ARGS -snapshot" ;; *) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 708520f..f761a8b 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -31,8 +31,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): image_type = get_bitbake_var(bb_output, 'IMAGE_FSTYPES').split()[0] 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-' + base + '-' + distro + '-qemu' + arch + '.ext4.img' + if image_type == 'ext4': + rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4' kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE') initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE') @@ -47,8 +47,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): extra_args = ['-kernel', kernel_image, '-initrd', initrd_image] extra_args.extend(kargs) - elif image_type == 'wic-img': - rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic.img' + elif image_type == 'wic': + rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic' extra_args = ['-snapshot'] else: raise ValueError('Invalid image type: ' + str(image_type)) -- 2.17.1