cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [3/6] git commit: updated refs/heads/master to 45eb9fd
Date Sun, 31 Mar 2013 15:02:35 GMT
debian: Include jasypt in the cloudstack-common package

This is required for the cloud-install-sys-tmplt installer.

Signed-off-by: Wido den Hollander <wido@42on.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29baacd1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29baacd1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29baacd1

Branch: refs/heads/master
Commit: 29baacd12062a9d9dedb4b0b8828a6e273e71dca
Parents: 5a16e70
Author: Wido den Hollander <wido@42on.com>
Authored: Sat Mar 30 16:32:08 2013 +0100
Committer: Wido den Hollander <wido@42on.com>
Committed: Sun Mar 31 14:16:31 2013 +0200

----------------------------------------------------------------------
 debian/cloudstack-common.install                  |    1 +
 debian/rules                                      |    3 +++
 scripts/storage/secondary/cloud-install-sys-tmplt |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29baacd1/debian/cloudstack-common.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-common.install b/debian/cloudstack-common.install
index 9677f87..021474e 100644
--- a/debian/cloudstack-common.install
+++ b/debian/cloudstack-common.install
@@ -26,6 +26,7 @@
 /usr/share/cloudstack-common/scripts/vm/hypervisor/kvm/*
 /usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh
 /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/*
+/usr/share/cloudstack-common/lib/*
 /usr/bin/cloud-set-guest-password
 /usr/bin/cloud-set-guest-sshkey
 /usr/lib/python2.?/*-packages/*

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29baacd1/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 3804d8d..907cdcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,6 +116,7 @@ install:
 	mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-common
 	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
 	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/setup
+	mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/lib
 	cp -r scripts/installer $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
 	cp -r scripts/network $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
 	cp -r scripts/storage $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
@@ -127,6 +128,8 @@ install:
 	install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin
 	install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin
 	install -D client/target/cloud-client-ui-$(VERSION)-SNAPSHOT/WEB-INF/classes/vms/systemvm.iso
$(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
+	# We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the
right place
+	install -D agent/target/dependencies/jasypt-1.9.0.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib
 
 	# cloudstack-python
 	mkdir -p $(DESTDIR)/usr/lib/python2.7/dist-packages

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29baacd1/scripts/storage/secondary/cloud-install-sys-tmplt
----------------------------------------------------------------------
diff --git a/scripts/storage/secondary/cloud-install-sys-tmplt b/scripts/storage/secondary/cloud-install-sys-tmplt
index 2172b28..bcdc4c4 100755
--- a/scripts/storage/secondary/cloud-install-sys-tmplt
+++ b/scripts/storage/secondary/cloud-install-sys-tmplt
@@ -40,7 +40,7 @@ DISKSPACE=5120000  #free disk space required in kilobytes
 dbHost=
 dbUser=
 dbPassword=
-jasypt='/usr/share/java/jasypt-1.9.0.jar'
+jasypt='/usr/share/cloudstack-common/lib/jasypt-1.9.0.jar'
 while getopts 'm:h:f:u:Ft:e:s:o:r:d' OPTION
 do
   case $OPTION in


Mime
View raw message