From a0a10a1057ceafe7abf6a8da30894c97e5a90a1a Mon Sep 17 00:00:00 2001
From: Yuya Kusakabe <yuya.kusakabe@gmail.com>
Date: Tue, 8 Mar 2016 11:17:56 +0900
Subject: Add support for signed VMware OVF (ref T14).

---
 scripts/build-vmware-image | 78 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100755 scripts/build-vmware-image

(limited to 'scripts/build-vmware-image')

diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image
new file mode 100755
index 00000000..189461eb
--- /dev/null
+++ b/scripts/build-vmware-image
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File: build-vmware-ovf
+# Purpose:
+#   Build VyOS OVF for VMware.
+
+if [ ! $(which vmdk-convert) ]; then
+   echo "Your system doesn't have vmdk-convert. Please install it from https://github.com/vmware/open-vmdk."
+   exit 1
+else
+   echo "Your system has vmdk-convert."
+fi
+
+if [ ! $(which ovftool) ]; then
+   echo "Your system doesn't have ovftool. Please install it from https://www.vmware.com/support/developer/ovf/."
+   exit 1
+else
+   echo "Your system has ovftool."
+fi
+
+export PACKER_BUILD_DIR=packer_build
+export PACKER_LOG_PATH=${PACKER_BUILD_DIR}/build_vmware_ovf.log
+export PACKER_LOG=1
+
+mkdir -p ${PACKER_BUILD_DIR}
+DST_DIR=${PACKER_BUILD_DIR}/vmware
+
+packer build -only=vmware-image scripts/packer.json
+
+# Convert raw image to VMDK
+source_image=${DST_DIR}/vyos_vmware_image.img
+tmp_vmdk=${DST_DIR}/tmp.vmdk
+vmdk=${DST_DIR}/vyos_vmware_image.vmdk
+ovf=${DST_DIR}/vyos_vmware_image.ovf
+qemu-img convert -f raw ${source_image} -O vmdk -o adapter_type=lsilogic ${tmp_vmdk}
+vmdk-convert ${tmp_vmdk} ${vmdk}
+
+# Generate OVF
+echo 'Generating OVF file...'
+vmdk_file_size=$(du --bytes ${vmdk} | cut -f1)
+vmdk_populated_size=$(vmdk-convert -i ${vmdk} | jq .used)
+version=$(cat build/version)
+sed scripts/template.ovf \
+  -e "s/{{vmdk_file_size}}/${vmdk_file_size}/" \
+  -e "s/{{vmdk_populated_size}}/${vmdk_populated_size}/" \
+  -e "s/{{version}}/${version}/" \
+  > ${ovf}
+
+# Generate manifest file
+cd ${DST_DIR}
+openssl sha1 *.vmdk *.ovf > vyos_vmware_image.mf
+
+# Convert the OVF to signed OVA...
+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/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-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
-- 
cgit v1.2.3


From b1e716208f9fb92966bda9b7425d6f67911105e4 Mon Sep 17 00:00:00 2001
From: Yuya Kusakabe <yuya.kusakabe@gmail.com>
Date: Sat, 26 Mar 2016 23:23:36 +0900
Subject: remove installing open-vm-tools process from build-vmware-image

---
 scripts/build-vmware-image | 12 ++++--------
 scripts/packer.json        |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'scripts/build-vmware-image')

diff --git a/scripts/build-vmware-image b/scripts/build-vmware-image
index 189461eb..e665e0b5 100755
--- a/scripts/build-vmware-image
+++ b/scripts/build-vmware-image
@@ -14,9 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# File: build-vmware-ovf
+# File: build-vmware-image
 # Purpose:
-#   Build VyOS OVF for VMware.
+#   Build VyOS OVA and OVF for VMware.
 
 if [ ! $(which vmdk-convert) ]; then
    echo "Your system doesn't have vmdk-convert. Please install it from https://github.com/vmware/open-vmdk."
@@ -33,16 +33,12 @@ else
 fi
 
 export PACKER_BUILD_DIR=packer_build
-export PACKER_LOG_PATH=${PACKER_BUILD_DIR}/build_vmware_ovf.log
-export PACKER_LOG=1
 
-mkdir -p ${PACKER_BUILD_DIR}
 DST_DIR=${PACKER_BUILD_DIR}/vmware
-
-packer build -only=vmware-image scripts/packer.json
+mkdir -p ${DST_DIR}
 
 # Convert raw image to VMDK
-source_image=${DST_DIR}/vyos_vmware_image.img
+source_image=${PACKER_BUILD_DIR}/qemu/vyos_qemu_image.img
 tmp_vmdk=${DST_DIR}/tmp.vmdk
 vmdk=${DST_DIR}/vyos_vmware_image.vmdk
 ovf=${DST_DIR}/vyos_vmware_image.ovf
diff --git a/scripts/packer.json b/scripts/packer.json
index 52b0b284..b09b9834 100644
--- a/scripts/packer.json
+++ b/scripts/packer.json
@@ -46,7 +46,7 @@
         "<enter><wait10><wait10>",
         "reboot<enter><wait5>",
         "Yes<enter><wait3m>",
-        "vyos<enter><wait>",
+        "vyos<enter><wait5>",
         "vyos<enter><wait10>",
         "configure<enter><wait5>",
         "set interface ethernet eth0 address dhcp<enter><wait5>",
-- 
cgit v1.2.3