From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7245237195775148032 X-Received: by 2002:a25:ada2:0:b0:ba7:b933:9063 with SMTP id z34-20020a25ada2000000b00ba7b9339063mr15454446ybi.4.1687410847467; Wed, 21 Jun 2023 22:14:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:9f84:0:b0:c00:898d:7377 with SMTP id u4-20020a259f84000000b00c00898d7377ls360357ybq.2.-pod-prod-09-us; Wed, 21 Jun 2023 22:14:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7JgCMMkcgFZiMHKsl0t2AOZ0eTLuS/F/vKd6/Ep7D3ytrxCAJXUrMW6mmIsj8vddmkJDK9 X-Received: by 2002:a25:bc53:0:b0:ba7:db6c:c0eb with SMTP id d19-20020a25bc53000000b00ba7db6cc0ebmr8209876ybk.3.1687410846669; Wed, 21 Jun 2023 22:14:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687410846; cv=none; d=google.com; s=arc-20160816; b=vaupX1w4WeqQsNOATxHKOAmKGWwRkUXX+OevAnIiOr47IGUimQkJ4AqVt+Im9duBdm Kt4HuakJdU/e7VlRFc+3/w4LZ0Lq7SeqYvm7Qes2VK26ooAUATYxGIz94Zplqb7VvPzg KVhxGZS8+ADCJQv4iUxe6njmPCjmVgol4lUTFhINtTOqku0j42u+2yTDuy4p/uaN6kVA /T/2RUyI6AucZDCZi41A8VVelXLCeqAdMdg7ep+oL7PVgn7YADHvNvyCeGdi/3Il+1w0 /4angFn3HJ3kdoFtrcAT2b1oNTWo6aZdEfKsCoUWJiWo1l5SYpIynMugse2B0vOori8H 4uOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=KraSUuKwlaSPqlH3zwiP6P1qGXL/o+CT5oQzQAd106s=; b=ONjH7Z/SALl3dQKwZDyJu6JUbtpLajclP4L10+Y9FhgsXocIyErVfK2VmCPfRq3Kmh pYDZ2Su+0N7GPz0pl4ZPPiTNop611VFYeoOuZJV1dA40KWyGi5GzLSdQrXfL0OcPL4Rs +YgJrcUnV/pdq2X6LcXaKgnx5X033mp/5iypWLHh/dcp8n8wCyp3Omxl6dFjgKhFY5K+ wAqaxzYo3Hvks1d8uLt75hCav6HWka173GJ0q4BsA4REsofBJBM9ABPdyUMJtl6wsYcq rEHhN3xkn0aKDNErZeQ9Ix6TrnJMDiPlAJcTR/HwxLQYrRDAGzG7cymIHoyUsuPcBB1n pgxA== 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 l197-20020a25ccce000000b00bed58c9607esi570134ybf.2.2023.06.21.22.14.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Jun 2023 22:14:06 -0700 (PDT) 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 [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 35M5E4EW008818 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 22 Jun 2023 07:14:05 +0200 Message-ID: <80f260481aa6cd54d218e3a791ccc184aa78f1d7.camel@ilbers.de> Subject: Re: [PATCH v2] vm-img: move templates from meta-isar to meta again From: Uladzimir Bely To: Henning Schild , isar-users@googlegroups.com Date: Thu, 22 Jun 2023 08:14:06 +0300 In-Reply-To: <20230616110615.25091-1-henning.schild@siemens.com> References: <20230616110615.25091-1-henning.schild@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.3 (by Flathub.org) MIME-Version: 1.0 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: 2yEzGuQ7oMV/ On Fri, 2023-06-16 at 13:06 +0200, 'Henning Schild' via isar-users wrote: > The vm image class needs these templates to work in cases where > people > do not have their own copies in their layers. Having them in meta- > isar > means that layers using the class with the default templates would > have > to use that example layer as well. >=20 > Fixes: 3ac61204e1ed ("replace custom OVA logic with imagetype logic") > Signed-off-by: Henning Schild > Reported-by: Clara Kowalsky > --- > =C2=A0meta/classes/imagetypes_vm.bbclass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | = 1 > + > =C2=A0.../recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl=C2=A0= =C2=A0=C2=A0 | 0 > =C2=A0.../recipes-core/images/vmware/vm-img-vmware.ovf.tmpl=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 0 > =C2=A03 files changed, 1 insertion(+) > =C2=A0rename {meta-isar =3D> meta}/recipes-core/images/virtualbox/vm-img- > virtualbox.ovf.tmpl (100%) > =C2=A0rename {meta-isar =3D> meta}/recipes-core/images/vmware/vm-img- > vmware.ovf.tmpl (100%) >=20 > diff --git a/meta/classes/imagetypes_vm.bbclass > b/meta/classes/imagetypes_vm.bbclass > index 41f2af067331..cd56d31b0fe0 100644 > --- a/meta/classes/imagetypes_vm.bbclass > +++ b/meta/classes/imagetypes_vm.bbclass > @@ -6,6 +6,7 @@ > =C2=A0 > =C2=A0inherit buildchroot > =C2=A0 > +FILESEXTRAPATHS:prepend =3D "${LAYERDIR_core}/recipes-core/images:" > =C2=A0OVF_TEMPLATE_FILE ?=3D "vm-img-virtualbox.ovf.tmpl" > =C2=A0IMAGE_SRC_URI:ova =3D "file://${OVF_TEMPLATE_FILE}" > =C2=A0 > diff --git a/meta-isar/recipes-core/images/virtualbox/vm-img- > virtualbox.ovf.tmpl b/meta/recipes-core/images/virtualbox/vm-img- > virtualbox.ovf.tmpl > similarity index 100% > rename from meta-isar/recipes-core/images/virtualbox/vm-img- > virtualbox.ovf.tmpl > rename to meta/recipes-core/images/virtualbox/vm-img- > virtualbox.ovf.tmpl > diff --git a/meta-isar/recipes-core/images/vmware/vm-img- > vmware.ovf.tmpl b/meta/recipes-core/images/vmware/vm-img- > vmware.ovf.tmpl > similarity index 100% > rename from meta-isar/recipes-core/images/vmware/vm-img- > vmware.ovf.tmpl > rename to meta/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl > --=20 > 2.39.3 >=20 Applied to next, thanks.