From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956804245323776 X-Received: by 2002:a05:600c:4f48:: with SMTP id m8mr10179412wmq.50.1639752530119; Fri, 17 Dec 2021 06:48:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4092:: with SMTP id o18ls594515wrp.1.gmail; Fri, 17 Dec 2021 06:48:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwX4w4elHhvj+/9skfSLZNKnQWpzsn458k/mxJROZIAMoA5Ky7Zr91dXSVR6xIGZhuEBeOI X-Received: by 2002:a5d:4949:: with SMTP id r9mr2805719wrs.494.1639752529237; Fri, 17 Dec 2021 06:48:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639752529; cv=none; d=google.com; s=arc-20160816; b=LOFElqK3mrxkQdKkKWsp5wZw4nUAj5Nxt09ADfmmGRqeRYMT8T2kjFElKSNOYZ5kdc 7QXVujtvYCTZZMRxz5aJscRmGD5I1w8qoaGdKTsSk/eoJ9CKxqcCI5G82+pJ6xHP8bzL m71ghF0pfbY+gBtmY2ByDIebcIhshFbEiDyXPKZ0/C5c4GfCsSXMYcR2A4ESIggGEMFA hDQqJPqsHlDlsE3ZgGMQegmF0yN5ZUORDF/Mc5LnmWZcmiKw7W7pX227wSEk1iDaUwnk spS8dAS+l63mJRMR22myiPurE5pnQntFLYyHZ4EaoD/U0gHDS8uqRtAaUF9gLio0fYSZ uddw== 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=9zvXMSiqoYABIcJXQHS61UiVvdl4NG6/3apkpw9xNQk=; b=j/5EzP2tBDsLHlglKdCFcqL9HJ+1TQOwxI2iOBqY7pZJY202LahBxKNRwTuA+2d5co EOJI/bTt2N9HQI60S80TTNpokfaecwh2/u4G9dG7Tplrgo+8bmixgNrxei7+D0/kuicH 2V3tWSr85c2I59wNe7KDwMgZDM0N16LmUZez2obf2vanZHFp3unkiGvbL4MrNYDhLWjF M1ElYZ7zwE7+W6V+0jpXvpI9ZFwRlnqfuZiBAj/tdFPGRoRIzhX5UxV37rb5FLuKt/4Q yGsToMBw7A7S4Ao5xDFytqllDLMqTBvOkyvq3JAKdAt5PsyCm1v+wCIJHEdns0vVSOiA +ohA== 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 g9si466978wrm.3.2021.12.17.06.48.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Dec 2021 06:48:49 -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 1BHEmh2r018603 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Dec 2021 15:48:48 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Henning Schild , Anton Mikanovich Subject: [PATCH v6 3/7] vm-img: shorten code by using variables we have Date: Fri, 17 Dec 2021 17:48:31 +0300 Message-Id: <20211217144835.14878-4-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211217144835.14878-1-amikan@ilbers.de> References: <20211217144835.14878-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: cc2A6Eg+EMOg 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 0733208..bae78c9 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