[PATCH 1/1] fix: unsupported value of disk format in ovf

[Chengshu Mou]

Hello guys,

 

I have a patch to fix the unsupported value of disk format in ovf file generated by Isar. Details are as follows:

Affected part:

Images for VMware and VirtualBox.

 

Modification:

Add ‘VMDK_SUBFORMAT’ into template vars of ovf.

 

Reference issue:

https://github.com/ilbers/isar/issues/106.

Patch:

From 792a013b26a474696d11a31a8bd069554b10b190 Mon Sep 17 00:00:00 2001
From: "Mou Chengshu(Ben)" <chengs...@siemens.com>
Date: Tue, 20 Aug 2024 13:28:06 +0800
Subject: [PATCH] fix: unsupported value of disk format in ovf

---
 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 56410de9..4da42447 100644
--- a/meta/classes/imagetypes_vm.bbclass
+++ b/meta/classes/imagetypes_vm.bbclass
@@ -60,7 +60,7 @@ macgen() {
 
 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"
+            OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE VMDK_SUBFORMAT"
 
 IMAGE_TEMPLATE_FILES:ova = "${OVF_TEMPLATE_FILE}"
 IMAGE_TEMPLATE_VARS:ova = "${OVA_VARS}"
--
2.39.2

Please have a look, thanks.

[Chengshu Mou]

[Uladzimir Bely]

On Tue, 2024-08-20 at 00:22 -0700, 'Chengshu Mou' via isar-users wrote:
> Hello guys,
>  
> I have a patch to fix the unsupported value of disk format in ovf
> file generated by Isar. Details are as follows:
>
> Affected part:
> Images for VMware and VirtualBox.
>  
> Modification:
> Add ‘VMDK_SUBFORMAT’ into template vars of ovf.
>  
> Reference issue:
> https://github.com/ilbers/isar/issues/106.
>

Hello.

The patch resolves real issue, but it's mailformed and not applicable
as is. Please could you send v2 with "git send-email" but not as
copypaste/attachment in your email client?

> Patch:
> From 792a013b26a474696d11a31a8bd069554b10b190 Mon Sep 17 00:00:00
> 2001
> From: "Mou Chengshu(Ben)" <chengs...@siemens.com>
> Date: Tue, 20 Aug 2024 13:28:06 +0800
> Subject: [PATCH] fix: unsupported value of disk format in ovf
>

missing "Signed-off-by"

> ---
>  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

wrong line break here

> index 56410de9..4da42447 100644
> --- a/meta/classes/imagetypes_vm.bbclass
> +++ b/meta/classes/imagetypes_vm.bbclass
> @@ -60,7 +60,7 @@ macgen() {
>  
>  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"
> +            OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE VMDK_SUBFORMAT"
>  
>  IMAGE_TEMPLATE_FILES:ova = "${OVF_TEMPLATE_FILE}"
>  IMAGE_TEMPLATE_VARS:ova = "${OVA_VARS}"
> --
> 2.39.2
>
> Please have a look, thanks.

> --
> You received this message because you are subscribed to the Google
> Groups "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it,
> send an email to isar-users+...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/isar-users/506abd25-6c6e-45ef-8087-89dacd1b0ff0n%40googlegroups.com
> .

--
Best regards,
Uladzimir.

[Mou Chengshu(Ben)]

Signed-off-by: Mou Chengshu(Ben) <chengs...@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

[Jan Kiszka]

Here, you should put in some words about what was wrong and/or how it
was visible. AKA: "commit message", the thing that should never be empty.

That said, thanks for digging into it and finding the root cause!

Jan

Siemens AG, Technology
Linux Expert Center

[Mou Chengshu(Ben)]

fix: unsupported value of disk format in ovf

Currently, Isar doesn't assign the variable 'VMDK_SUBFORMAT' into ovf template
that causes generated ovf file contains unsupported disk format value and error
message will be reported when import it into ESXi.

Signed-off-by: Mou Chengshu(Ben) <chengs...@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 56410de9..4da42447 100644
--- a/meta/classes/imagetypes_vm.bbclass
+++ b/meta/classes/imagetypes_vm.bbclass
@@ -60,7 +60,7 @@ macgen() {

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"
+ OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE VMDK_SUBFORMAT"

IMAGE_TEMPLATE_FILES:ova = "${OVF_TEMPLATE_FILE}"
IMAGE_TEMPLATE_VARS:ova = "${OVA_VARS}"
--

2.39.2

[Jan Kiszka]

On 23.08.24 04:23, Mou Chengshu(Ben) wrote:
> fix: unsupported value of disk format in ovf
>

Almost: duplicate subject line.

> Currently, Isar doesn't assign the variable 'VMDK_SUBFORMAT' into ovf template
> that causes generated ovf file contains unsupported disk format value and error
> message will be reported when import it into ESXi.
>

That's perfect!

Jan

> Signed-off-by: Mou Chengshu(Ben) <chengs...@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 56410de9..4da42447 100644
> --- a/meta/classes/imagetypes_vm.bbclass
> +++ b/meta/classes/imagetypes_vm.bbclass
> @@ -60,7 +60,7 @@ macgen() {
>
> 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"
> + OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE VMDK_SUBFORMAT"
>
> IMAGE_TEMPLATE_FILES:ova = "${OVF_TEMPLATE_FILE}"
> IMAGE_TEMPLATE_VARS:ova = "${OVA_VARS}"

--

[Mou Chengshu(Ben)]

Currently, Isar doesn't assign the variable 'VMDK_SUBFORMAT' into ovf template
that causes generated ovf file contains unsupported disk format value and error
message will be reported when import it into ESXi.

Signed-off-by: Mou Chengshu(Ben) <chengs...@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 56410de9..4da42447 100644
--- a/meta/classes/imagetypes_vm.bbclass
+++ b/meta/classes/imagetypes_vm.bbclass
@@ -60,7 +60,7 @@ macgen() {

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"
+ OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE VMDK_SUBFORMAT"

IMAGE_TEMPLATE_FILES:ova = "${OVF_TEMPLATE_FILE}"
IMAGE_TEMPLATE_VARS:ova = "${OVA_VARS}"
--

2.39.2

[Uladzimir Bely]

Applied to next, thanks.

--
Best regards,
Uladzimir.