From: Henning Schild <henning.schild@siemens.com>
To: <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH v4 3/7] vm-img: Shorten code by using variables we have.
Date: Wed, 15 Dec 2021 16:48:40 +0100 [thread overview]
Message-ID: <20211215154844.1495-4-henning.schild@siemens.com> (raw)
In-Reply-To: <20211215154844.1495-1-henning.schild@siemens.com>
this is a purely cosmetic change making use of shorthands we have
Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
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 d8f7fdf2c580..6dad708fe32c 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.32.0
next prev parent reply other threads:[~2021-12-15 15:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 15:48 [PATCH v4 0/7] vm-img improvements and fixes Henning Schild
2021-12-15 15:48 ` [PATCH v4 1/7] vm-img: Move template out of package into SRC_URI file Henning Schild
2021-12-15 15:48 ` [PATCH v4 2/7] vm-img: Use two different ovf templates for vmware/virtualbox Henning Schild
2021-12-15 15:48 ` Henning Schild [this message]
2021-12-15 15:48 ` [PATCH v4 4/7] vm-img: Drop not used variables Henning Schild
2021-12-15 15:48 ` [PATCH v4 5/7] vm-img: Set vmware machine type to 64bit in our template Henning Schild
2021-12-15 15:48 ` [PATCH v4 6/7] vm-img: Make use of isars template class for most of the tmpl variables Henning Schild
2021-12-15 15:48 ` [PATCH v4 7/7] meta-isar: Switch virtualbox test from buster to bullseye Henning Schild
2021-12-15 15:50 ` [PATCH v4 0/7] vm-img improvements and fixes Henning Schild
2021-12-15 15:57 ` Jan Kiszka
2021-12-15 16:21 ` Anton Mikanovich
2021-12-15 16:35 ` Henning Schild
2021-12-16 13:23 ` Baurzhan Ismagulov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211215154844.1495-4-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox