summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuya Kusakabe <yuya.kusakabe@gmail.com>2016-03-08 11:17:56 +0900
committerYuya Kusakabe <yuya.kusakabe@gmail.com>2016-03-08 11:17:56 +0900
commita0a10a1057ceafe7abf6a8da30894c97e5a90a1a (patch)
treea2e2851159364898070f9eeb8009f41c28361920
parentc5df2dd17dffda133a0c0bb68d6a9a16c10f1c2e (diff)
downloadvyos-build-a0a10a1057ceafe7abf6a8da30894c97e5a90a1a.tar.gz
vyos-build-a0a10a1057ceafe7abf6a8da30894c97e5a90a1a.zip
Add support for signed VMware OVF (ref T14).
-rw-r--r--Makefile6
-rwxr-xr-xscripts/build-vmware-image (renamed from scripts/build-vmware-ova)8
2 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6c401e2c..2e6dd9ad 100644
--- a/Makefile
+++ b/Makefile
@@ -44,12 +44,12 @@ qemu:
@scripts/check-vm-build-env
@scripts/build-qemu-image
-.PHONY: vmware-ova
+.PHONY: vmware
.ONESHELL:
-vmware-ova:
+vmware:
@set -e
@scripts/check-vm-build-env
- @scripts/build-vmware-ova
+ @scripts/build-vmware-image
.PHONY: clean
.ONESHELL:
diff --git a/scripts/build-vmware-ova b/scripts/build-vmware-image
index c0e85cdc..189461eb 100755
--- a/scripts/build-vmware-ova
+++ b/scripts/build-vmware-image
@@ -68,7 +68,11 @@ openssl sha1 *.vmdk *.ovf > vyos_vmware_image.mf
echo 'Converting the OVF to signed OVA...'
private_key=${PRIVATE_KEY_PATH:-"../../key/privatekey.pem"}
if [ ! -f ${private_key} ]; then
- echo 'Please put your key to "key" directory in repository root, or set PRIVATE_KEY_PATH to environment variables.'
+ echo 'Please put your key to "key/privatekey.pem" in repository root, or set PRIVATE_KEY_PATH to environment variables.'
exit 1
fi
-ovftool --privateKey=${PRIVATE_KEY_PATH} vyos_vmware_image.ovf vyos_vmware_image.ova
+ovftool --privateKey=${PRIVATE_KEY_PATH} vyos_vmware_image.ovf vyos_vmware_image-signed.ova
+
+# Convert the OVF to signed OVF...
+echo 'Converting the OVF to signed OVF...'
+ovftool --privateKey=${PRIVATE_KEY_PATH} vyos_vmware_image.ovf vyos_vmware_image-signed.ovf