Merge lp:~tribaal/livecd-rootfs/fix-ova-manifest into lp:livecd-rootfs

[Chris Glass]

This branch fixes the OVA generation.

When creating the manifest we passed the .ova extension twice, resulting in an invalide filename.

[Robert C Jennings (rcj)]

+1 on the code changes.

The commit messages should refer to the bug (i.e. (LP: #1627931) and when you commit you can add the '--fixes lp:#####' flag to get the bug in the commit metadata as well (see http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/revision/1446.1.1).

Not a fan of the comment on r1456 as it lacks context without reading r1455, but a merge commit will take care of that.

review: Needs Fixing

[Philip Roche (philroche)]

Also +1 on code changes

review: Approve

[lp:~tribaal/livecd-rootfs/fix-ova-manifest]

1455. By Chris Glass on 2017-01-16

This branch fixes the manifest generation in OVA files (LP:1627931)

The .ova file extension was passed twice, resulting in file not found errors in
both the general case and the vagrant-specific file creation.

[Chris Glass (tribaal)]

Collapsed commits into one and changed commit message (used --fixes).

[Dan Watkins (oddbloke)]

review: Approve

[Robert C Jennings (rcj)]

+1

review: Approve

[Brian Murray (brian-murray)]

The bug should have a livecd-rootfs bug task so that when the new version of livecd-roots is uploaded the Launchpad janitor will close that bug task. I'll add one and get this merged.

=== 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:23:38 +0000
@@ -67,7 +67,7 @@
 manifest="${scratch_d}/${prefix}.mf"
 cat > "${manifest}" <<EOF
 SHA256(${vmdk_f##*/})= ${vmdk_sha256}
-SHA256(${ovf##*/}.ovf)= ${ovf_sha256}
+SHA256(${ovf##*/})= ${ovf_sha256}
 EOF
 
 # Now create the OVA

=== 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:23:38 +0000
@@ -181,7 +181,7 @@
 cat > "${manifest}" <<EOF
 SHA256(${vmdk_f##*/})= ${vmdk_sha256}
 SHA256(${cdrom_vmdk_f##*/})= ${cdrom_sha256}
-SHA256(${ovf##*/}.ovf)= ${ovf_sha256}
+SHA256(${ovf##*/})= ${ovf_sha256}
 EOF
 
 # Now create the box