diff mbox series

imagetypes_vm: Fix default of OVF_TEMPLATE_FILE

Message ID ef7e4508-8c0f-42dd-9ba7-2d9a8c65cf5b@siemens.com
State Accepted, archived
Headers show
Series imagetypes_vm: Fix default of OVF_TEMPLATE_FILE | expand

Commit Message

Jan Kiszka Dec. 11, 2024, 8:26 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

When enabling the ova image type but keeping the default
OVF_TEMPLATE_FILE, lots of parsing errors will be generated because the
virtualbox file was not found so far.

See also https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/119

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/imagetypes_vm.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Uladzimir Bely Dec. 17, 2024, 6:08 a.m. UTC | #1 
On Wed, 2024-12-11 at 09:26 +0100, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> When enabling the ova image type but keeping the default
> OVF_TEMPLATE_FILE, lots of parsing errors will be generated because
> the
> virtualbox file was not found so far.
> 
> See also
> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/119
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/imagetypes_vm.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/imagetypes_vm.bbclass
> b/meta/classes/imagetypes_vm.bbclass
> index 4da42447..b20a8e04 100644
> --- a/meta/classes/imagetypes_vm.bbclass
> +++ b/meta/classes/imagetypes_vm.bbclass
> @@ -5,7 +5,7 @@
>  #
>  
>  FILESEXTRAPATHS:prepend = "${LAYERDIR_core}/recipes-core/images:"
> -OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl"
> +OVF_TEMPLATE_FILE ?= "virtualbox/vm-img-virtualbox.ovf.tmpl"
>  IMAGE_SRC_URI:ova = "file://${OVF_TEMPLATE_FILE}"
>  
>  IMAGE_TYPEDEP:ova = "wic"
> -- 
> 2.43.0
> 

Applied to next, thanks.
diff mbox series

Patch

diff --git a/meta/classes/imagetypes_vm.bbclass b/meta/classes/imagetypes_vm.bbclass
index 4da42447..b20a8e04 100644
--- a/meta/classes/imagetypes_vm.bbclass
+++ b/meta/classes/imagetypes_vm.bbclass
@@ -5,7 +5,7 @@ 
 #
 
 FILESEXTRAPATHS:prepend = "${LAYERDIR_core}/recipes-core/images:"
-OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl"
+OVF_TEMPLATE_FILE ?= "virtualbox/vm-img-virtualbox.ovf.tmpl"
 IMAGE_SRC_URI:ova = "file://${OVF_TEMPLATE_FILE}"
 
 IMAGE_TYPEDEP:ova = "wic"