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

[Dan Watkins]

Review: Needs Information



Diff comments:

> === modified file 'live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary'
> --- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2016-06-09 09:47:25 +0000
> +++ live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2017-01-16 09:27:54 +0000
> @@ -14,6 +14,21 @@
>                   *) echo "OVA images are not supported for $ARCH yet.";
>                       exit 0;;
>  esac
> +
> +# 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

We have a case statement on ARCH above; can we roll this in to that one?

> +        amd64)
> +           ovf_id=94
> +           ovf_os_type="ubuntu64Guest"
> +           ovf_desc_bits=64 ;;
> +        i386)
> +           ovf_id=93
> +           ovf_os_type="ubuntu32Guest"
> +           ovf_desc_bits=32 ;;
> +esac
> +
>  cur_d=${PWD}
>  my_d=$(dirname $(readlink -f ${0}))
>  
> 
> === modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
> --- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2016-09-09 22:56:47 +0000
> +++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2017-01-16 09:27:54 +0000
> @@ -25,6 +25,20 @@
>  		exit 0
>  esac
>  
> +# 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

We have a case statement on ARCH above; can we roll this in to that one?

> +        amd64)
> +           ovf_id=94
> +           ovf_os_type="ubuntu64Guest"
> +           ovf_desc_bits=64 ;;
> +        i386)
> +           ovf_id=93
> +           ovf_os_type="ubuntu32Guest"
> +           ovf_desc_bits=32 ;;
> +esac
> +
>  . /build/config/functions
>  
>  # Virtualbox is needed for making a small VMDK


-- 
https://code.launchpad.net/~tribaal/livecd-rootfs/fix-ubuntu-ovf-attributes/+merge/314702
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~tribaal/livecd-rootfs/fix-ubuntu-ovf-attributes into lp:livecd-rootfs.