You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/09/08 10:45:26 UTC
git commit: updated refs/heads/4.3 to a1d230b
Repository: cloudstack
Updated Branches:
refs/heads/4.3 fc5c92ed2 -> a1d230b88
appliance: fix build.sh for vmware systemvm building and exporting
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1d230b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1d230b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1d230b8
Branch: refs/heads/4.3
Commit: a1d230b88b8ae4e618201928079c0b17c994a3b8
Parents: fc5c92e
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Sep 8 10:39:52 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Sep 8 10:39:52 2014 +0200
----------------------------------------------------------------------
tools/appliance/build.sh | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1d230b8/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index d29f95b..50cca56 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -26,7 +26,14 @@ else
fi
build_date=`date +%Y-%m-%d`
-branch="master"
+
+# set fixed or leave empty to use git to determine
+branch=
+
+if [ -z "$branch" ] ; then
+ branch=`(git name-rev --no-undefined --name-only HEAD 2>/dev/null || echo unknown) | sed -e 's/remotes\/.*\///g'`
+fi
+
rootdir=$PWD
# Initialize veewee and dependencies
@@ -95,8 +102,8 @@ echo "$appliance exported for VMWare: dist/$appliance-$build_date-$branch-vmware
vboxmanage export $machine_uuid --output $appliance-$build_date-$branch-vmware.ovf
mv $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware.ovf-orig
java -cp convert Convert convert_ovf_vbox_to_esx.xslt $appliance-$build_date-$branch-vmware.ovf-orig $appliance-$build_date-$branch-vmware.ovf
-tar -cf $appliance-$build_date-$branch-vmware.ova $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware-disk1.vmdk
-rm -f $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware.ovf-orig $appliance-$build_date-$branch-vmware-disk1.vmdk
+tar -cf $appliance-$build_date-$branch-vmware.ova $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware-disk[0-9].vmdk
+rm -f $appliance-$build_date-$branch-vmware.ovf $appliance-$build_date-$branch-vmware.ovf-orig $appliance-$build_date-$branch-vmware-disk[0-9].vmdk
echo "$appliance exported for VMWare: dist/$appliance-$build_date-$branch-vmware.ova"
# Export for HyperV