From: Henning Schild <henning.schild@siemens.com>
To: isar-users@googlegroups.com
Cc: "Q . Gylstorff" <Quirin.Gylstorff@siemens.com>,
Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 3/7] vm-img: shorten code by using variables we have
Date: Wed, 22 Sep 2021 16:11:43 +0200 [thread overview]
Message-ID: <20210922141147.4696-4-henning.schild@siemens.com> (raw)
In-Reply-To: <20210922141147.4696-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 debdf3b2fdf8..e94b6de2d799 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-09-22 14:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 14:11 [PATCH 0/7] vm-img improvements and fixes Henning Schild
2021-09-22 14:11 ` [PATCH 1/7] vm-img: move template out of package into SRC_URI file Henning Schild
2021-10-06 14:08 ` Henning Schild
2021-12-15 15:44 ` Henning Schild
2021-09-22 14:11 ` [PATCH 2/7] vm-img: use two different ovf templates for vmware/virtualbox Henning Schild
2021-09-22 14:11 ` Henning Schild [this message]
2021-09-22 14:11 ` [PATCH 4/7] vm-img: drop not used variables Henning Schild
2021-09-22 14:11 ` [PATCH 5/7] vm-img: set vmware machine type to 64bit in our template Henning Schild
2021-09-22 14:11 ` [PATCH 6/7] vm-img: make use of isars template class for most of the tmpl variables Henning Schild
2021-09-22 14:11 ` [PATCH 7/7] meta-isar: switch virtualbox test from buster to bullseye Henning Schild
2021-09-22 14:14 ` [PATCH 0/7] vm-img improvements and fixes Henning Schild
2021-09-22 17:05 ` Henning Schild
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=20210922141147.4696-4-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=Quirin.Gylstorff@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