Merge lp:~tribaal/livecd-rootfs/fix-ubuntu-ovf-attributes into lp:livecd-rootfs

[Chris Glass]

This branch fixes the OVF's metadata to include Ubuntu-specific identifiers and descriptions instead of the generic linux ones (lp:1656293).

This applies to both the general image and the vagrant-specific one.

This branch fixes the OVF creation attributes, using the OVF-specified ID and descriptions for Ubuntu 32 and 64 bits depending on the currently-built architecture.

[Philip Roche (philroche)]

LGTM

review: Approve

[Robert C Jennings (rcj)]

+1 on the code changes. For the commit message I would like to see vmdk/ova mentioned, not just vagrant, plus the bug number.

review: Needs Fixing

[lp:~tribaal/livecd-rootfs/fix-ubuntu-ovf-attributes]

1455. By Chris Glass on 2017-01-16

This branch fixes the OVF's metadata to include Ubuntu-specific identifiers and
descriptions instead of the generic linux ones (lp:1656293).

This applies to both the general image and the vagrant-specific one.

[Chris Glass (tribaal)]

Change commit message.

[Dan Watkins (daniel-thewatkins)]

review: Needs Information

[Robert C Jennings (rcj)]

Chris, thanks for the commit msg change. I'm +1 once Dan's 'need info' comments are addressed.

[Robert C Jennings (rcj)]

review: Needs Information

[lp:~tribaal/livecd-rootfs/fix-ubuntu-ovf-attributes]

1456. By Chris Glass on 2017-01-17

Roll both switches on $ARCH into one, as suggested at review.

[Robert C Jennings (rcj)]

+1, thanks Chris

review: Approve

[Dan Watkins (daniel-thewatkins)]

review: Approve

[Brian Murray (brian-murray)]

The changes to "041-vmdk-ova-image.binary" adds handling (well an error message) for arches other than amd64 or i386 but "042-vagrant.binary" does not. Was not adding an error message to 042-vagrant.binary deliberate?

review: Needs Information

[lp:~tribaal/livecd-rootfs/fix-ubuntu-ovf-attributes]

1457. By Chris Glass on 2017-02-16

Rool both switches into one for all affected files (the vagrant file was still
doing two switches on $ARCH).

[Chris Glass (tribaal)]

> The changes to "041-vmdk-ova-image.binary" adds handling (well an error
> message) for arches other than amd64 or i386 but "042-vagrant.binary" does
> not. Was not adding an error message to 042-vagrant.binary deliberate?

Ah, good catch - I did collapse both switches on $ARCH into one for the vmdk hook, but forgot to do the same for the vagrant file (the same warning message was already in the file - just not in the diff).

It's functionally the same, but it's nicer now.

[lp:~tribaal/livecd-rootfs/fix-ubuntu-ovf-attributes]

1458. By Chris Glass on 2017-02-16

Fixed template omission (found wile running a build withthis branch).

=== modified file 'live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary'
--- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2017-01-16 09:22:55 +0000
+++ live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2017-02-16 02:11:45 +0000
@@ -9,11 +9,24 @@
 #
 # For this step, we re-use the VMDK's made in 040-vmdk-image.binary
 
+
+# Switch on $ARCH to determine which ID and description to use in the produced
+# OVF. We have fancy Ubuntu-specific IDs in the OVF specification, we might as
+# well use them.
 case $ARCH in
-        amd64|i386) ;;
-                 *) echo "OVA images are not supported for $ARCH yet.";
-                     exit 0;;
+        amd64)
+            ovf_id=94
+            ovf_os_type="ubuntu64Guest"
+            ovf_desc_bits=64 ;;
+        i386)
+            ovf_id=93
+            ovf_os_type="ubuntu32Guest"
+            ovf_desc_bits=32 ;;
+        *)
+            echo "OVA images are not supported for $ARCH yet.";
+            exit 0;;
 esac
+
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))
 
@@ -57,7 +70,10 @@
     -e "s/@@NUM_CPUS@@/2/g" \
     -e "s/@@VERSION@@/${version}/g" \
     -e "s/@@DATE@@/${serial_stamp}/g" \
-    -e "s/@@MEM_SIZE@@/1024/g"
+    -e "s/@@MEM_SIZE@@/1024/g" \
+    -e "s/@@OVF_ID@@/${ovf_id}/g" \
+    -e "s/@@OVF_OS_TYPE@@/${ovf_os_type}/g" \
+    -e "s/@@OVF_DESC_BITS@@/${ovf_desc_bits}/g"
 
 # Get the checksums
 vmdk_sha256=$(sha256sum ${vmdk_f} | cut -d' ' -f1)

=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-01-16 09:22:55 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-02-16 02:11:45 +0000
@@ -18,11 +18,21 @@
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))
 
+# Switch on $ARCH to determine which ID and description to use in the produced
+# OVF. We have fancy Ubuntu-specific IDs in the OVF specification, we might as
+# well use them.
 case $ARCH in
-	amd64|i386) ;;
-	*)
-		echo "Vagrant images are not supported for $ARCH"
-		exit 0
+        amd64)
+           ovf_id=94
+           ovf_os_type="ubuntu64Guest"
+           ovf_desc_bits=64 ;;
+        i386)
+           ovf_id=93
+           ovf_os_type="ubuntu32Guest"
+           ovf_desc_bits=32 ;;
+        *)
+           echo "Vagrant images are not supported for $ARCH"
+           exit 0;;
 esac
 
 . /build/config/functions
@@ -172,7 +182,10 @@
     -e "s/@@NUM_CPUS@@/2/g" \
     -e "s/@@VERSION@@/${version}/g" \
     -e "s/@@DATE@@/${serial_stamp}/g" \
-    -e "s/@@MEM_SIZE@@/1024/g"
+    -e "s/@@MEM_SIZE@@/1024/g" \
+    -e "s/@@OVF_ID@@/${ovf_id}/g" \
+    -e "s/@@OVF_OS_TYPE@@/${ovf_os_type}/g" \
+    -e "s/@@OVF_DESC_BITS@@/${ovf_desc_bits}/g"
 
 ovf_sha256=$(sha256sum ${ovf} | cut -d' ' -f1)
 

=== modified file 'live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl'
--- live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl	2015-11-12 21:49:25 +0000
+++ live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl	2017-02-16 02:11:45 +0000
@@ -18,8 +18,9 @@
   <VirtualSystem ovf:id="@@NAME@@">
     <Info>A virtual machine</Info>
     <Name>@@NAME@@</Name>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other3xLinux64Guest">
+    <OperatingSystemSection ovf:id="@@OVF_ID@@" vmw:osType="@@OVF_OS_TYPE@@">
       <Info>The kind of installed guest operating system</Info>
+      <Description>Ubuntu Linux (@@OVF_DESC_BITS@@-bit)</Description>
     </OperatingSystemSection>
 
     <ProductSection ovf:required="false">

=== modified file 'live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl'
--- live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl	2015-11-12 21:49:25 +0000
+++ live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl	2017-02-16 02:11:45 +0000
@@ -16,8 +16,9 @@
   <VirtualSystem ovf:id="@@NAME@@">
     <Info>A virtual machine</Info>
     <Name>@@NAME@@</Name>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other3xLinux64Guest">
+    <OperatingSystemSection ovf:id="@@OVF_ID@@" vmw:osType="@@OVF_OS_TYPE@@">
       <Info>The kind of installed guest operating system</Info>
+      <Description>Ubuntu Linux (@@OVF_DESC_BITS@@-bit)</Description>
     </OperatingSystemSection>
 
     <ProductSection ovf:required="false">