| Message ID | 20230616110024.24291-1-henning.schild@siemens.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | vm-img: move templates from meta-isar to meta again | expand |
Am Fri, 16 Jun 2023 13:00:24 +0200 schrieb Henning Schild <henning.schild@siemens.com>: > 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.swn | Bin 0 -> 16384 > bytes meta/classes/imagetypes_vm.bbclass | 1 + > .../virtualbox/vm-img-virtualbox.ovf.tmpl | 0 > .../images/vmware/vm-img-vmware.ovf.tmpl | 0 > 4 files changed, 1 insertion(+) > create mode 100644 meta/classes/.imagetypes_vm.bbclass.swn > 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.swn > b/meta/classes/.imagetypes_vm.bbclass.swn new file mode 100644 > index > 0000000000000000000000000000000000000000..88cdc4380ce74795279686cd6bb71c428157ecf9 > GIT binary patch literal 16384 mhh sorry for that one, will send a v2 > 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 > TO^EmUp>?JczV|%lr`3M}a;f;3 > > literal 0 > HcmV?d00001 > > 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
diff --git a/meta/classes/.imagetypes_vm.bbclass.swn b/meta/classes/.imagetypes_vm.bbclass.swn new file mode 100644 index 0000000000000000000000000000000000000000..88cdc4380ce74795279686cd6bb71c428157ecf9 GIT binary patch literal 16384 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 TO^EmUp>?JczV|%lr`3M}a;f;3 literal 0 HcmV?d00001 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
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.swn | Bin 0 -> 16384 bytes meta/classes/imagetypes_vm.bbclass | 1 + .../virtualbox/vm-img-virtualbox.ovf.tmpl | 0 .../images/vmware/vm-img-vmware.ovf.tmpl | 0 4 files changed, 1 insertion(+) create mode 100644 meta/classes/.imagetypes_vm.bbclass.swn 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%)