From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956804245323776 X-Received: by 2002:a17:906:9754:: with SMTP id o20mr16060643ejy.277.1639673179378; Thu, 16 Dec 2021 08:46:19 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:40cf:: with SMTP id z15ls238957edb.2.gmail; Thu, 16 Dec 2021 08:46:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNxCb8N+B2hkCy/IxupncA2aHe1+UlQ8tC/4Ptqvz7geNqZddZSSjbCHIfgWPpEka4zTA7 X-Received: by 2002:a05:6402:270d:: with SMTP id y13mr21279741edd.362.1639673178422; Thu, 16 Dec 2021 08:46:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639673178; cv=none; d=google.com; s=arc-20160816; b=N1LRLkbxmA9rvZx3oq/YnR1Vjo6KEp8IZnN+VDYZX4XpwJF7QuUxNNdC/i/zXprRhu OBWo12YTI3ASY8O4+rJCX4JrhZQAJYpA15tRLjsL7mSsMEO9HhC3jpgHdivR1YHo9hjQ QZ63DJpjUevee9CrdluOQ/pVm5DT+HTXkf8Zqwe9lf3JZ6OffRfa5ivBdG8z9bibI4KV iDB4bdmWBMiIlKYMat9rq/lNhJ5Zz7BWbD1RGRF0H9y5/xxwO05k/56WPFj0huoWVGDN 9HEJ07BFebxtPsw5HP4xwkPFoYxsiy+jNBLxMXPC3IroQjb1BU0T8VzFyAT8okyHamXG n5lw== 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=40JB/fZz/NAyA226AG5WMeIZ3jV+amvMy6OwLa4c5H8=; b=Pj6eAXQEkO+wLtDJzx9w9JGT3p3Is5Uf4mETrPw7cIELuGk2PBHcPs95f/k/Eb5dDx sp0XURyvX+mIsUynpqbbKSWLY7LKMBmq4UxNC6YnI2D+y+pq6AJDqiyfERzhRXWqIZji /KskVo3s/OXIlZ6LQBQfJMeZzQ+isAkqTZjo7YMRp9V8dMy0p0uvtJvLacZ9qSBhBw6q b46vKBctf+0TZAaQRXJOrwlzWd0+EtJguq1pqfbFlAbiNWF4chlgPajcUwv0+NuyeEc/ zVKSw3+fnwkcZcPfn011aJESP45ApfE0gRwrTTrLeESQ/mwg7Z6e1NpecqZIQ54bLn0X 0S+Q== 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 eb8si268192edb.0.2021.12.16.08.46.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Dec 2021 08:46:18 -0800 (PST) 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-214-81-214-37.mgts.dynamic.pppoe.byfly.by [37.214.81.214] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1BGGk8Wp014355 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Dec 2021 17:46:17 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Henning Schild , Anton Mikanovich Subject: [PATCH v5 3/7] vm-img: shorten code by using variables we have Date: Thu, 16 Dec 2021 19:45:58 +0300 Message-Id: <20211216164602.326689-4-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211216164602.326689-1-amikan@ilbers.de> References: <20211216164602.326689-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: e9YVY8A/Bx3k From: Henning Schild This is a purely cosmetic change making use of shorthands we have. Signed-off-by: Henning Schild Signed-off-by: Anton Mikanovich --- meta/classes/vm-img.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/vm-img.bbclass b/meta/classes/vm-img.bbclass index debdf3b..e94b6de 100644 --- a/meta/classes/vm-img.bbclass +++ b/meta/classes/vm-img.bbclass @@ -37,10 +37,10 @@ CONVERSION_OPTIONS = "${@set_convert_options(d)}" do_convert_wic() { rm -f '${DEPLOY_DIR_IMAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}' image_do_mounts - bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${WIC_IMAGE_FILE}" + bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${SOURCE_IMAGE_FILE}" sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ /usr/bin/qemu-img convert -f raw -O ${VIRTUAL_MACHINE_IMAGE_TYPE} ${CONVERSION_OPTIONS} \ - '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}' + '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${VIRTUAL_MACHINE_DISK}' } addtask convert_wic before do_build after do_wic_image do_copy_boot_files do_install_imager_deps do_transform_template -- 2.25.1