From 4d7dced2f892f6bd42df097e6d556ca1f26e8ec6 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Tue, 5 Mar 2013 12:39:00 +0100 Subject: [PATCH] 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. --- packaging/centos63/cloud-agent.rc | 2 +- packaging/centos63/cloud.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index 6d011d8edd3..58611f299ba 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 diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 2d893084554..f4970cfdffc 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