CLOUDSTACK-1469 Commit 2f135be1 introduced jna as a dependency for hypervisor kvm, so make sure the version from the operating system is not used anymore
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6223520e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6223520e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6223520e Branch: refs/heads/marvin-refactor Commit: 6223520efd000b759da1b58586e9982761ffcd66 Parents: 512c16f Author: Hugo Trippaers <[email protected]> Authored: Fri Mar 1 14:54:11 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Fri Mar 1 14:54:11 2013 +0100 ---------------------------------------------------------------------- packaging/centos63/cloud-agent.rc | 2 +- packaging/centos63/cloud.spec | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6223520e/packaging/centos63/cloud-agent.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index d885dad..152e61e 100755 --- a/packaging/centos63/cloud-agent.rc +++ b/packaging/centos63/cloud-agent.rc @@ -59,7 +59,7 @@ export JAVA_HOME SCP="" DCP="" ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'` -JCP="/usr/share/java/jna.jar:/usr/share/java/commons-daemon.jar" +JCP="/usr/share/java/commons-daemon.jar" # 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/6223520e/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index ab71d0f..24ec245 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -113,7 +113,6 @@ Requires: libvirt Requires: bridge-utils Requires: ebtables Requires: jsvc -Requires: jna Requires: jakarta-commons-daemon Requires: jakarta-commons-daemon-jsvc Provides: cloud-agent
