From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7198076072096694272 X-Received: by 2002:a17:90b:3e86:b0:231:1ce4:fd77 with SMTP id rj6-20020a17090b3e8600b002311ce4fd77mr248841pjb.46.1676522525550; Wed, 15 Feb 2023 20:42:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:e38d:b0:225:cae6:ff24 with SMTP id b13-20020a17090ae38d00b00225cae6ff24ls2851645pjz.2.-pod-preprod-gmail; Wed, 15 Feb 2023 20:42:04 -0800 (PST) X-Google-Smtp-Source: AK7set9rIllF4koQ2k14zXtyWW/OPtS8IMfifCLZzRQvQkMjxY0SYXDmWGEAw+YmimJJ5WZeWZtP X-Received: by 2002:a17:903:41c8:b0:199:1b8a:42a8 with SMTP id u8-20020a17090341c800b001991b8a42a8mr5546795ple.6.1676522524542; Wed, 15 Feb 2023 20:42:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676522524; cv=none; d=google.com; s=arc-20160816; b=LyGpADNMfwpExvGZcGr77wXpnoRK54mt5G1c3e9aJ6n/RcKL55z2CayyI8ZXSZO0Fl TmDlVQl6FFZGClry4Zij7rJV+L2hW1hzavwYnnAqxZdPI7fxfqRIlXn5gRGMBXwLFi0m olYeh/jrUVuU6RLTLSaajkX/iOZtmSpjXEgSN8em0RxMOJk9HmomN5bqwIZ3qlvT2nyy k0YlYx4fOJYZ0pgIR9ZbOynsJrc9PlOTUf1s3qkAb5jV63LWvGefKbA3JQMmUqmG247K ShU+ISLbSEXBt0CYrg1w+bWXZdYIq7YQQomqThmkjUMqX28rx209ZoTugR7D8kwtdl3V UDTw== 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:to:from; bh=8ipVCuExjbZ9TyofuXrBLm9ScvZ7sPg69mU/qkEx5w8=; b=ao7t9jGaEL54VzTa8hIstuRHw2igSIUwgZlw6dod7bMXTHfW7ApcYwyHCmMRZPsPVt WNfLjGSM375TcNvB4fxlGZUl6czo7zZb5PngCT9u1GtmlICaTWVuklSSN822F/PNOw66 JKwwwlpKLWqevJDvcJxDLvrCqNgEn1Egipbm9Rbhywyh0gfPZwvXloJMJBKnCxpQe5FE PF3EiAWfy3dXKP7Avf7kKoJeF6GP329O4kjnt71l/GZm/UKN7ohUM6uHQgzYTsLVokSs wOzuzzLvLpnjiDHR90ra1bnqS+0+G4B0DJT8LfvNOquO2bInW711Kj2phSo8ic8YLuf9 cbgA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id iw4-20020a170903044400b0019498477f33si16413plb.11.2023.02.15.20.42.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Feb 2023 20:42:04 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from home.localnet (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 31G4g1pc016833 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Feb 2023 05:42:02 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com, Felix Moessbauer Subject: Re: [PATCH v3 1/1] replace custom OVA logic with imagetype logic Date: Thu, 16 Feb 2023 07:42:01 +0300 Message-ID: <3387302.LZWGnKmheA@home> In-Reply-To: <20230210084044.714348-1-felix.moessbauer@siemens.com> References: <20230210084044.714348-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" 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: YTm+Xgnaz714 In the email from Friday, 10 February 2023 11:40:44 +03 user Felix Moessbauer wrote: > This patch refactors the imagetypes_vm class for virtualbox and vmware > images. The existing manual implementation does not work anymore when > referencing ova config files across layers. Instead, we now use the > imagetypes logic, which avoids the problematic changes of > FILESEXTRAPATHS and SRC_URI. > > Acked-by: Adriaan Schmidt > Signed-off-by: Felix Moessbauer > --- > Changes since v2: > > - removed API-CHANGELOG-ENTRY as recommended by reviewer > > Changes since v1: > > - append with += to IMAGER_INSTALL:ova > > Note: > > The following pattern does NOT work: IMAGER_INSTALL:append:ova. > The reason is that we unconditionally append to the variable in > the machine config. This pattern is known as not supported. > > Felix > > .../images/virtualbox}/vm-img-virtualbox.ovf.tmpl | 0 > .../recipes-core/images/vmware}/vm-img-vmware.ovf.tmpl | 0 > meta/classes/imagetypes_vm.bbclass | 9 +++------ > 3 files changed, 3 insertions(+), 6 deletions(-) > rename {meta/classes/vm-img => > meta-isar/recipes-core/images/virtualbox}/vm-img-virtualbox.ovf.tmpl (100%) > rename {meta/classes/vm-img => > meta-isar/recipes-core/images/vmware}/vm-img-vmware.ovf.tmpl (100%) > > diff --git a/meta/classes/vm-img/vm-img-virtualbox.ovf.tmpl > b/meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl > similarity index 100% > rename from meta/classes/vm-img/vm-img-virtualbox.ovf.tmpl > rename to > meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl diff > --git a/meta/classes/vm-img/vm-img-vmware.ovf.tmpl > b/meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl similarity > index 100% > rename from meta/classes/vm-img/vm-img-vmware.ovf.tmpl > rename to meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl > diff --git a/meta/classes/imagetypes_vm.bbclass > b/meta/classes/imagetypes_vm.bbclass index 81ef866f..41f2af06 100644 > --- a/meta/classes/imagetypes_vm.bbclass > +++ b/meta/classes/imagetypes_vm.bbclass > @@ -6,11 +6,8 @@ > > inherit buildchroot > > -USING_OVA = "${@bb.utils.contains('IMAGE_BASETYPES', 'ova', '1', '0', d)}" > - > -FILESEXTRAPATHS:prepend := "${LAYERDIR_core}/classes/vm-img:" > OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl" > -SRC_URI += "${@'file://${OVF_TEMPLATE_FILE}' if d.getVar('USING_OVA') == > '1' else ''}" +IMAGE_SRC_URI:ova = "file://${OVF_TEMPLATE_FILE}" > > IMAGE_TYPEDEP:ova = "wic" > IMAGER_INSTALL:ova += "qemu-utils gawk uuid-runtime" > @@ -67,8 +64,8 @@ OVA_VARS = "OVA_NAME OVA_MEMORY OVA_NUMBER_OF_CPU OVA_VRAM > \ OVA_FIRMWARE OVA_ACPI OVA_3D_ACCEL \ > OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE" > > -TEMPLATE_FILES += "${@'${OVF_TEMPLATE_FILE}' if d.getVar('USING_OVA') == > '1' else ''}" -TEMPLATE_VARS += "${OVA_VARS}" > +IMAGE_TEMPLATE_FILES:ova = "${OVF_TEMPLATE_FILE}" > +IMAGE_TEMPLATE_VARS:ova = "${OVA_VARS}" > > do_image_ova[prefuncs] += "convert_wic" > IMAGE_CMD:ova() { Applied to next, thanks