cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [44/50] [abbrv] git commit: refs/heads/ui-multiple-nics - rpm: Place the KVM Agent JAR in the lib directory
Date Tue, 05 Mar 2013 18:37:39 GMT
rpm: Place the KVM Agent JAR in the lib directory

All JAR files should go into the lib directory, that also
makes building the classpath easier.


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

Branch: refs/heads/ui-multiple-nics
Commit: 4d7dced2f892f6bd42df097e6d556ca1f26e8ec6
Parents: 72c4d6a
Author: Wido den Hollander <wido@widodh.nl>
Authored: Tue Mar 5 12:39:00 2013 +0100
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Tue Mar 5 16:10:38 2013 +0100

----------------------------------------------------------------------
 packaging/centos63/cloud-agent.rc |    2 +-
 packaging/centos63/cloud.spec     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4d7dced2/packaging/centos63/cloud-agent.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
index 6d011d8..58611f2 100755
--- a/packaging/centos63/cloud-agent.rc
+++ b/packaging/centos63/cloud-agent.rc
@@ -56,7 +56,7 @@ for jdir in $JDK_DIRS; do
 done
 export JAVA_HOME
 
-ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/*.jar
| tr '\n' ':' | sed s'/.$//'`
+ACP=`ls /usr/share/cloudstack-agent/lib/*.jar | tr '\n' ':' | sed s'/.$//'`
 
 # We need to append the JSVC daemon JAR to the classpath
 # AgentShell implements the JSVC daemon methods

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4d7dced2/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 2d89308..f4970cf 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -262,7 +262,7 @@ install -D agent/target/transformed/environment.properties ${RPM_BUILD_ROOT}%{_s
 install -D agent/target/transformed/log4j-cloud.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/log4j-cloud.xml
 install -D agent/target/transformed/cloud-setup-agent ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-agent
 install -D agent/target/transformed/cloud-ssh ${RPM_BUILD_ROOT}%{_bindir}/%{name}-ssh
-install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%name-agent/cloud-plugin-hypervisor-kvm-%{_maventag}.jar
+install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%name-agent/lib/cloud-plugin-hypervisor-kvm-%{_maventag}.jar
 cp plugins/hypervisors/kvm/target/dependencies/*  ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib
 
 # Usage server


Mime
View raw message