From 4bc9def5d6bd987c1ac8d59bc48cc521c311c4b8 Mon Sep 17 00:00:00 2001
From: Christopher Glass <christopher.glass@canonical.com>
Date: Fri, 17 Mar 2017 13:32:55 -0500
Subject: [PATCH] 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.
---
 live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary | 2 +-
 live-build/ubuntu-cpc/hooks/042-vagrant.binary        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
index c48ca75b..8b5ecefd 100755
--- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
+++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary
@@ -67,7 +67,7 @@ ovf_sha256=$(sha256sum ${ovf} | cut -d' ' -f1)
 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
diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index ca08e44e..aa524a09 100755
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@@ -181,7 +181,7 @@ manifest="${box_d}/${prefix}.mf"
 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