From: Henning Schild <henning.schild@siemens.com>
To: <isar-users@googlegroups.com>
Cc: Felix Moessbauer <felix.moessbauer@siemens.com>,
Adriaan Schmidt <adriaan.schmidt@siemens.com>,
Henning Schild <henning.schild@siemens.com>,
Clara Kowalsky <clara.kowalsky@siemens.com>
Subject: [PATCH v2] vm-img: move templates from meta-isar to meta again
Date: Fri, 16 Jun 2023 13:06:15 +0200 [thread overview]
Message-ID: <20230616110615.25091-1-henning.schild@siemens.com> (raw)
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.
Fixes: 3ac61204e1ed ("replace custom OVA logic with imagetype logic")
Signed-off-by: Henning Schild <henning.schild@siemens.com>
Reported-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
meta/classes/imagetypes_vm.bbclass | 1 +
.../recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl | 0
.../recipes-core/images/vmware/vm-img-vmware.ovf.tmpl | 0
3 files changed, 1 insertion(+)
rename {meta-isar => meta}/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl (100%)
rename {meta-isar => meta}/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl (100%)
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 @@
inherit buildchroot
+FILESEXTRAPATHS:prepend = "${LAYERDIR_core}/recipes-core/images:"
OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl"
IMAGE_SRC_URI:ova = "file://${OVF_TEMPLATE_FILE}"
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
--
2.39.3
next reply other threads:[~2023-06-16 11:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-16 11:06 Henning Schild [this message]
2023-06-16 11:27 ` Uladzimir Bely
2023-06-16 11:54 ` Henning Schild
2023-06-22 5:14 ` Uladzimir Bely
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=20230616110615.25091-1-henning.schild@siemens.com \
--to=henning.schild@siemens.com \
--cc=adriaan.schmidt@siemens.com \
--cc=clara.kowalsky@siemens.com \
--cc=felix.moessbauer@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