From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:ac5:cdfa:: with SMTP id v26mr1901670vkn.12.1639514168835; Tue, 14 Dec 2021 12:36:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6122:21ac:: with SMTP id j44ls3394699vkd.4.gmail; Tue, 14 Dec 2021 12:36:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJxaVoHtr0COwQhZ9uzDzELhxrymzibHX+aKLYL2MN6Xpiar3DZ3fmIc77alWyPHutOn4sQy X-Received: by 2002:a1f:d903:: with SMTP id q3mr1827612vkg.38.1639514168282; Tue, 14 Dec 2021 12:36:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639514168; cv=none; d=google.com; s=arc-20160816; b=MpuV7ePA74MjKXZERx+KDprDuDLWVIF/TN8bLDGVSDvIJmqeqT6mnmALhagNJlnOdG TSKccq4eC3JpvQudAKD8iSaX0pArq+bZxfPHKsKjofwsRT7BG/h5yAeaNZ4FgKQxfIqL 0u6rz4c+KQ20RvsxN8Ynb4HqPRsw7b8y7LQD+bGOtqI8lrmR/KzaqIn9VdqSs5/te4Ut P7v5xzvZmNMyp+FpWLf5zMBCi0uxSXy0nQs7xB96uEyqFtrHrlv+cpaWES4ESFTN62FY i2vyJw6GXBk84Dh8X0ccCGb6g7FTQd1/DvRljMsIfkVOnX38DVuC2k9XK+h8zNMXXRBl yHWw== 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=uPzFky2KLTOWAg4l8gdHIjE/yP+MgBNlHWLBPb5hLQ4=; b=fvXNFVOgum9UYGDODBgdy1gJwKbDu6GHltb46ZyfNyPefD38YMhltQ7QK+10dlLnsY 353bUHVGbyGKt7AhiOT5KTKK4O9PeeOPFTw547q0OaneDCYGhd2CSFYXoqyLvMzmk5iq GYLfp/s3sQxkT/U0qpZBzb4QyW7PbmeUR8e5vck03eKW94c1NASX8CmsIUan0BPY4ESE xpjEGX282NGtcr+7ZNxyrjlswe7QR0Qwt0RMdyhhTC5niVt044uxh/D9gJ8oEr06qVRw 6uxu6588sNnlUwqny9IHxNH/VNrKO0t1Jo4cbdtBmXHShoiE66BfAsGF784rvd6vdwtb NfNg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id e76si34707vke.5.2021.12.14.12.36.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 12:36:08 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 1BEKa6CP001233 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 14 Dec 2021 21:36:06 +0100 Received: from localhost.localdomain ([139.22.39.210]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1BEKa5qP009540; Tue, 14 Dec 2021 21:36:06 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v2 3/7] vm-img: shorten code by using variables we have Date: Tue, 14 Dec 2021 21:35:58 +0100 Message-Id: <20211214203602.21996-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211214203602.21996-1-henning.schild@siemens.com> References: <20211214203602.21996-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: /XqTAJYpeNEo this is a purely cosmetic change making use of shorthands we have Signed-off-by: Henning Schild --- 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