Commit Graph

62 Commits

Author SHA1 Message Date
Wido den Hollander 8608ba30d2 CLOUDSTACK-1589: Don't depend on chkconfig
Signed-off-by: Joe Brockmeier <jzb@zonker.net>
2013-04-17 10:38:17 -05:00
Wido den Hollander 2f99c25a04 deb: Have the agent depend on the System ISO
This is needed for deploying System VMs on a KVM hypervisor

Without this ISO we can't deploy this System VMs
2012-12-05 10:15:20 -06:00
David Nalley f758b12270 fixing missing comma in debian/control 2012-10-12 19:05:22 -04:00
David Nalley ebe0601367 making awsapi depend on cloud-client which sets up the cloud user 2012-10-12 18:56:48 -04:00
Wido den Hollander c446c459b9 debian: Depend on antlr from the Ubuntu repositories for AWS API
The antlr JAR files conflict with the Ubuntu packages for this JAR files.

Maven depends on this as well, so when you try to install cloud-awsapi on a system
with Maven installed, you get:

(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
 trying to overwrite '/usr/share/java/antlr-2.7.7.jar', which is also in package libantlr-java 2.7.7+dfsg-3
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
 cloud-awsapi_4.0.0-incubating_amd64.deb

antlr-2.7.7.jar is in classpath.conf, so we can depend on this package and it will be loaded
for AWS API
2012-10-10 17:01:17 +02:00
Wido den Hollander 38dca7c9c3 debian: Depend on libcommons-fileupload-java for AWS API
This JAR is also provided by a Ubuntu package and is the version we depend on with Maven.

By adding this JAR to wscript_configure it is added to the classpath so the AWS API will be able to use it.

Not having this will result in a conflict in a package conflict

During build time we will build against the version fetched by Maven, but runtime we will use the one from
the Ubuntu repository.
2012-10-10 14:54:05 +02:00
Wido den Hollander e2288ad518 debian: Depend on dom4j from Ubuntu repository for AWS API
On my system I already had libdom4j-java installed and this lead to:

(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from .../cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing ../cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
 trying to overwrite '/usr/share/java/dom4j-1.6.1.jar', which is also in package libdom4j-java 1.6.1+dfsg.2-5
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
 ../cloud-awsapi_4.0.0-incubating_amd64.deb

Since this JAR file is available from the Ubuntu repository we depend on it instead of packaging it ourselfs.
2012-10-10 14:41:25 +02:00
Wido den Hollander 62ad5af4d4 debian: Do not package xml-apis for AWS API
This conflicts with with libjaxp1.3-java on Ubuntu systems.

libjaxp1.3-java is installed when maven is installed, so on my local system I got:

root@gateway:/usr/src# dpkg -i cloud-awsapi_4.0.0-incubating_amd64.deb
(Reading database ... 68888 files and directories currently installed.)
Unpacking cloud-awsapi (from cloud-awsapi_4.0.0-incubating_amd64.deb) ...
dpkg: error processing cloud-awsapi_4.0.0-incubating_amd64.deb (--install):
 trying to overwrite '/usr/share/java/xml-apis-1.3.04.jar', which is also in package libjaxp1.3-java 1.3.05-2ubuntu2
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
 cloud-awsapi_4.0.0-incubating_amd64.deb
root@gateway:/usr/src#

This prevents you from installing the AWS API on a Ubuntu machine which also has Maven installed.

The classpath is still generated by WAF which looks in the deps/ directory and will find the same JAR file
there as what's in the Deb package we depend on.
2012-10-10 14:13:55 +02:00
Rohit Yadav f20d6369e4 Revert: javassist related recent changes
Changes:
 - Have javassist dependency in awsapi/pom.xml
 - Have it deployed by waf while rpm building in wscript_build
 - Fixed dependency in debian/control
 - Add javassist pkg in cloud-deps for debian

This is a squashed commit of the following:

commit eed46e7749f2716d0046f6c8237e9900043078ee
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:42:41 2012 +0530

    Revert: Add javaassist dependence"

    Reverted javassist but axis2-1.5.1.jar is still first in the classpath
    This reverts commit 7bcbae5e91.

commit eab6b6afe9331bf3920fafbd59695141366a2a61
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:38:42 2012 +0530

    Revert: "maven: Remove javassist as a dependency for AWS API"

    We want javassist to be fetched by mvn and get it packaged in
    cloud-deps.
    This reverts commit 8504332404.

commit 35af1ebdb6340105f342dbfc461f5fb892b9ab76
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:36:43 2012 +0530

    Revert: "add javassit on the classpath"

    We don't need javassist from a distro's repo. That is included in
    cloud-deps.
    This reverts commit 66daa1a2bc.

commit cb11d153fbb809aad94f0a3d19f3efba13691d71
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:34:09 2012 +0530

    Revert: "fix rpm build"

    We need javaassist for awsapi package.
    This reverts commit c49f3beccf.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-10 12:49:38 +05:30
Edison Su 7bcbae5e91 axis2-1.5.1.jar should be loaded at first, add javaassist dependence 2012-10-09 19:31:41 -07:00
Edison Su 863c9e6ccf oh, wido, wido 2012-10-09 18:05:23 -07:00
Wido den Hollander 5f2f3c22cc debian: Dependency update cloud-awsapi
A lot of JAR files are provided by the Debian and Ubuntu package repositories.

We can depend on them instead of packaging them ourselfs.
2012-10-09 23:38:50 +02:00
Wido den Hollander 9e5a7b1323 debian: Update description cloud-awsapi package 2012-10-09 23:30:57 +02:00
Edison Su ffe1dbbf53 add aws deb build 2012-10-09 13:27:22 -07:00
Wido den Hollander a9ec123c2d debian: Don't have cloud-agent depend on libservlet2.5-java 2012-09-26 21:38:11 -07:00
Wido den Hollander d40d5cd9f7 debian: Fix dependencies around libcommons*java
Packages like cloud-agent were depending on various libcommons* packages
which are only used in the server and utils.

Correct the dependency for this
2012-09-26 21:37:44 -07:00
Wido den Hollander 60a043f908 debian: Do not have cloud-agent depend on libcommons-httpclient
Already done by cloud-agent-libs
2012-09-26 21:37:15 -07:00
Wido den Hollander 3da14f6bc3 debian: Do not have cloud-agent depend on python
It depends on cloud-python and that depends on python already
2012-09-26 21:37:11 -07:00
Wido den Hollander 5ab6ac285e debian: Have cloud-server depend on cloud-scripts 2012-09-26 21:36:36 -07:00
Wido den Hollander 465e0466c3 debian: Remove Google GSON from cloud-agent-deps and depend on cloud-deps
Both the Agent and Server require Google GSON. This is not available from
the Ubuntu repositories, so we have to package it ourselfs.

Due to the fact that people might choose to run the Hypervisor on the same
host as the management server we can't have cloud-agent-deps conflict with cloud-deps

cloud-agent-deps now depends on cloud-deps so the hypervisor has Google GSON 1.7.1

This results in a number of extra JAR files to be installed on the hypervisor.
2012-09-14 15:03:17 +02:00
Wido den Hollander 7eaf537d95 Rename cloud-agent-scripts to cloud-scripts
The management server also depends on a couple of these scripts, so renaming
to cloud-scripts makes more sence then installing cloud-agent-scripts.

In the future we might want to split this up in two packages.
2012-09-13 16:29:01 +02:00
Wido den Hollander e426ba25ed debian: Remove vmops-* package references
In CS 3.X the name vmops wasn't used for packages, so it's safe to remove this now.
2012-09-13 16:29:01 +02:00
Wido den Hollander ababd0cbdc debian: Depend on either maven3 or maven with version 3 or higher. 2012-09-13 09:38:27 +02:00
Edison Su 17b2af2a90 on ubuntu, in order to build debs, need to add add-apt-repository ppa:natecarlson/maven3, then install maven3 2012-09-12 15:27:51 -07:00
Wido den Hollander 93126414bc debian: Get backport-util-concurrent from the Debian repositories 2012-09-11 14:03:38 +02:00
Wido den Hollander e7ff6ecd77 debian: Depend on jsch from the repository
This way we don't need to distribute the JAR in cloud-deps
2012-09-11 13:31:50 +02:00
Wido den Hollander a84ec1218d debian: Install cglib through the package manager
cglib 2.2.2 is available in Ubuntu and Debian from the repositories, no need
to ship it in the cloud-deps package.

It's also not used by cloud-agent, but by cloud-utils, so place the dependency there.
2012-09-11 13:24:26 +02:00
Wido den Hollander a6a74c7d9c debian: Depend on log4j 1.2.16 and add to CLASSPATH
Ubuntu 12.04 and Debian (testing) both ship from their repository, so there is no need
for us to distribute it in our packages.

We depend on it externally for our logging.
2012-09-10 16:42:07 +02:00
Wido den Hollander 6f03c327f5 debian: Make maven a build dependency
We require at least Maven 3.0.4 for building the Debian packages.

This is available in Debian Testing and Ubuntu 12.04
2012-09-10 16:42:07 +02:00
Wido den Hollander e77937d1cf debian: Fix homepage and maintainer
We might want to change the maintainer to the dev list?
2012-09-07 16:20:17 +02:00
Wido den Hollander 664927948a debian: Fix dependencies
We depend on more packages and not ship these JAR files ourselfs
2012-09-07 16:18:46 +02:00
Wido den Hollander 9064236879 debian: Depend on the MySQL Java connector
Ubuntu and Debian provide the JDBC MySQL connector, we depend on this for running the client
2012-08-31 19:57:51 +02:00
Wido den Hollander de285bd9c8 debian: Update a couple of descriptions for the management server 2012-07-25 14:52:29 +02:00
Wido den Hollander b00f7cc983 debian: Update dependencies
No need for these packages to depend on any cloud-agent package.

If they need files from this packages, then we need to move those files.

The client/management server should never depend on agent packages.
2012-07-25 14:50:37 +02:00
Wido den Hollander 672ceed87d debian: Description update for a couple of packages 2012-07-25 14:48:38 +02:00
Wido den Hollander 0f6150b8b3 debian: Depend on lsb-base package
The init script uses LSB, so we need to depend on that
2012-07-25 14:44:53 +02:00
Wido den Hollander eab3e4783e Remove cloud-daemonize and use JSVC
We now use JSVC for daemonizing our agent and usage server.
2012-07-24 19:32:39 +02:00
Wido den Hollander 44f289e0a6 debian: Do not depend on the cloud-daemonize package
We are in the process of removing this from all packages and files
2012-07-19 13:35:27 +02:00
Edison Su dfb0eed5a4 fix ubuntu 12.04 build 2012-07-16 18:00:05 -07:00
Wido den Hollander ca8d852409 debian: Remove jnetpcap from the dependency list 2012-06-23 14:31:15 +02:00
Wido den Hollander 1df520c8e4 debian: Remove the Console Proxy
Signed-off-by: Wido den Hollander <wido@widodh.nl>
2012-06-04 23:41:40 -04:00
frank b4186eac6c CS-14411 cloud-cli missing from Ubuntu packages
resolved fixed
2012-04-12 11:11:49 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
frank 0126048709 Bug 11472 - 2.2.12 beta ubuntu builds fails on install usage
add usage to debian build
reviewed-by: edison
2011-09-20 13:20:49 -07:00
frank 92a053fa07 fix debian build 2011-09-12 11:39:40 -07:00
frank ba9640b5d4 change debian build in line with opensource 2011-09-12 11:39:26 -07:00
frank a949d2706d Add cloud-agent-deps as dependency of cloud-deps in debian build 2011-07-01 15:36:13 -07:00
frank cb9fb47617 change cloud-system-iso dependency to cloud-client in debian buil 2011-07-01 14:39:20 -07:00
frank 84ef8861fd Add cloud-system-iso as dependency of cloud-agent-scripts in debian build 2011-07-01 14:36:51 -07:00
Edison Su 5b6eb1cd33 add wget dependence 2011-06-14 23:38:18 -04:00