From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7010760649199321088 X-Received: by 2002:a2e:9410:: with SMTP id i16mr18719874ljh.134.1632319915195; Wed, 22 Sep 2021 07:11:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:5843:: with SMTP id x3ls532672ljd.10.gmail; Wed, 22 Sep 2021 07:11:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4mAf8x/nj7Z35nqurZhnKVaahy9BzTiOPcyoW6yOr/9Wd982Cg8bEfhc/fmXEk32DAXgs X-Received: by 2002:a2e:8e89:: with SMTP id z9mr2653102ljk.350.1632319914152; Wed, 22 Sep 2021 07:11:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632319914; cv=none; d=google.com; s=arc-20160816; b=tWUFqKX8cTnQ96igyEE+JMjRaTMV6tlcQTOaLycJN3YLaKo5iph2wRLxpeENQ5k79V o+J7dj7bWgI5xXciy5Nq+AE46cPM5s1QtuKbGpDGG6DzQRAPsJem0ahKAH0FGNZ529FJ SpzcGUNPdHgGFDh8OyafsUdEFeyLmVWzQWil/k9nGzXw5LEGmgxougvNGdTVZeY85p/f nvUxrIy1QeqKutD6ss6NyS5/AgIuWg2SM/Dp/Mh+B/Yz1574DK4KSOT+zpqrSIlrY12B 9L+wOY6RyRmSNXtbI8klKcEVu9LD71U40cKdFzSIo4g7UKMOowp/TSGOavJuIcWOG8k7 ANqA== 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=RU6IOGCgw3lS87/UvTl8cWftq3U+a+fFQBLTRh+KuKb4++XgdheMPl2qW15NPMNg7O 4QAaiIFTg9M/JvgMu2EB/lXXpfdqbkmnokapgD9Re/WOIhpNb/dH+GpLUaeIvDDqVNJY sLgON8Kv2zMo23jy8BTHeYowb23HcMxclOfmm3J3tPS+saDa9OLf/PZrWg4nRlGZhyaH uMV41tlQ+N8q7SrRL9VUVNOF/c6UDeLGeW85WVEBimyKyRiOyWVgD4OQtAa0Zfm4W/jH mTV5qxkNAkMrSvx63UvbP/9ZE0iczJctUPXOGA2mZf5M9CGiI+V7vwfSi3tKivUPzK41 +uuw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id t17si133585lfd.9.2021.09.22.07.11.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Sep 2021 07:11:54 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 18MEBr6s026912 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 22 Sep 2021 16:11:53 +0200 Received: from localhost.localdomain ([167.87.35.234]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 18MEBqiB013583; Wed, 22 Sep 2021 16:11:53 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: "Q . Gylstorff" , Henning Schild Subject: [PATCH 3/7] vm-img: shorten code by using variables we have Date: Wed, 22 Sep 2021 16:11:43 +0200 Message-Id: <20210922141147.4696-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210922141147.4696-1-henning.schild@siemens.com> References: <20210922141147.4696-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Bv9IWCKHpGqg 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