Commit Graph

177 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
Chip Childers 18e8aad0e1 Updating version number from 4.0.1-incubating to 4.0.2 in a number of places
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-15 18:56:19 +01:00
Chip Childers 7dcbd81093 Correcting debian/changelog trailer line formatting
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-15 18:16:16 +01:00
Chip Childers 6e3dbde05e Setting deb package version to 4.0.2
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-15 18:10:19 +01:00
Chip Childers 6f6bfadd78 Removed DISCLAIMER file from deb rules
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-15 18:06:34 +01:00
Gavin Lee 333e7c4ae6 Push the nonoss lib by mistake, revert them.
Revert "BUILD: Make CloudStack buildable with nonoss libs"

This reverts commit 20fab87108.
2012-12-26 17:51:40 +08:00
Rohit Yadav 20fab87108 BUILD: Make CloudStack buildable with nonoss libs
Nonoss libs are packaged into cloud-deps rpm

Make sure you've following nonoss libs:
 deps/cloud-iControl.jar
 deps/cloud-manageontap.jar
 deps/cloud-netscaler-sdx.jar
 deps/cloud-netscaler.jar
 deps/vmware-apputils.jar
 deps/vmware-vim.jar
 deps/vmware-vim25.jar

This reverse engineers and sort of reverts the commit:
5ae15f8bbf.

The vhd-util is downloaded and added to (refer CLOUDSTACK-134)
scripts/vm/hypervisor/xenserver/vhd-util, from:
http://download.cloud.com.s3.amazonaws.com/tools/vhd-util

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-25 07:17:43 +08:00
David Nalley 486c8b6b1d trying to fix the changelog which has broken things 2012-12-07 14:26:32 -05:00
David Nalley e0fe847f34 fixing changelog 2012-12-07 12:31:34 -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
Prasanna Santhanam 368a9ff524 4.0.1 - bump up the debian build to 4.0.1-incubating 2012-12-04 16:05:06 -08:00
Rohit Yadav e9692831b5 CLOUDSTACK-515: Package nvp_commands.properties for debian
This fixes the missing nvp_commands.properties in debian builds for the client
package.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-29 12:07:20 -08:00
Edison Su 3bb722fe5b CLOUDSTACK-363: set the version number to 4.0.0-incubating 2012-10-16 16:59:00 -07:00
Edison Su 90178b771d Revert "CLOUDSTACK-363: use the default build version number, we coded in wscript"
This reverts commit 196961c757.
2012-10-16 16:49:34 -07:00
Edison Su 196961c757 CLOUDSTACK-363: use the default build version number, we coded in wscript 2012-10-16 15:41:11 -07: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
David Nalley f1f604d3d8 fixing deb and rpm builds from source tarballs 2012-10-12 14:11:45 -04:00
Edison Su 5ee613fbf2 This fix doesn't work, no link been created on fresh installation ubuntu
Revert "debian: Package symlinks and config files for AWS API"

This reverts commit 3854de46ce.
2012-10-10 14:41:37 -07:00
Wido den Hollander 3854de46ce debian: Package symlinks and config files for AWS API
We should not do any of these things on postinst files, this will lead to garbage
staying behind when removing the package, confusing sysadmins

By creating the symlinks on the rules file they will get added into the DEB package
and cleaned up should the package be removed.
2012-10-10 17:50:27 +02: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
Edison Su a253fd3f10 add these jars back, 2012-10-09 17:35:40 -07:00
Chip Childers 8bb7226397 Modified references to 4.0.0 to 4.0.0-incubating 2012-10-09 20:22:59 -04:00
Edison Su 8b592301a4 set ownership to cloud 2012-10-09 15:35:33 -07:00
Edison Su 18226b067d add cloud awsapi postinit 2012-10-09 15:24:00 -07:00
Edison Su b9e936c345 add more dep jar 2012-10-09 15:16:51 -07:00
Wido den Hollander e86e9d3fab debian: Package less cloud-awsapi JAR files
These libraries do not seem to be used/imported in the AWS API code so we don't have to package them
2012-10-09 23:41:48 +02: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
Wido den Hollander 8b4814467a debian: Do not package the axis2 jar in cloud-deps
This is only needed by cloud-awsapi and we already package it there.
2012-10-09 23:29:51 +02:00
Edison Su a3e0fe8366 fix tab 2012-10-09 13:41:36 -07:00
Edison Su af17555089 fix ubuntu deb build 2012-10-09 13:27:22 -07:00
Edison Su ffe1dbbf53 add aws deb build 2012-10-09 13:27:22 -07:00
Chip Childers 735def2c5c Fixed debian/changelog format error 2012-10-05 16:11:36 -04:00
Chip Childers 455f6264db Switching debian/changelog version to 4.0.0 2012-10-05 15:50:46 -04:00
Wido den Hollander cd28aa34be debian: Bump the version to 4.0 beta 6 2012-10-05 11:11:21 -07:00
David Nalley 3efbf868f5 fixing a broken ubuntu build 2012-10-04 20:29:05 -04:00
Wido den Hollander e2dbc2853d debian: Fix version number for beta1
dpkg thought it was a downgrade from rc2 to beta1, add a epoch at the front
2012-09-26 21:38: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 ed59ec194a debian: Add docs to packages 2012-09-26 21:37:55 -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 e577f64058 debian: Bump the version number to beta1 2012-09-26 21:37:06 -07:00