Commit Graph

207 Commits

Author SHA1 Message Date
David Nalley
599048c9b2 CLOUDSTACK-1629 - adding a conflict with antlr package 2013-04-14 22:23:54 -04: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
Satoshi Kobayashi
f58747426b CLOUDSTACK-498 Missing dependency in RPMs of KVM agent 2012-11-27 19:24:45 -06:00
Hiroaki Kawai
6164ec0ac4 https://reviews.apache.org/r/6941/ - fix openjdk build requirement in spec file 2012-10-24 14:29:19 -04:00
David Nalley
6a4dc6a2ce first iteration of source.xml 2012-10-22 10:49:09 -04:00
David Nalley
f1f604d3d8 fixing deb and rpm builds from source tarballs 2012-10-12 14:11:45 -04: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
c49f3beccf fix rpm build 2012-10-09 19:35:50 -07:00
Rohit Yadav
1ead1730b4 CLOUDSTACK-292: Add commons-fileupload to cloud-deps 2012-10-09 19:05:25 +05:30
Rohit Yadav
9b53150cf5 CLOUDSTACK-292: Add missing jars to cloud-deps
- fixes axiom-impl version to avoid class load exception
- with copying of libs is not done in cloud.spec anymore, add jars to
  cloud-deps
- make aws-api package depend on cloud-deps
2012-10-09 16:20:03 +05:30
frank
1814df52b5 remove changes of /etc/security/limits.conf from spec file 2012-10-08 17:27:16 -07:00
Rohit Yadav
21bea9c8e2 Revert: "Restore the lib directory"
This reverts commit 3b78d6980a.

Conflicts:
	cloud.spec
2012-10-08 17:22:08 +05:30
Rohit Yadav
e241925057 CLOUDSTACK-221: Force symlink if any existing symlink
Force symlink, in case there is an existing symlink but the file it
links to does not exist.
2012-10-08 16:39:58 +05:30
Alex Huang
3b78d6980a Restore the lib directory 2012-10-08 04:07:28 -07:00
Rohit Yadav
98eef5c949 CLOUDSTACK-221: Add user/group before installing aws-api
Since cloud-client requires aws-api package, and is installed
before aws-api, the patch sets up user/group first.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-08 15:40:35 +05:30
Alex Huang
8ec7cf2b42 More changes 2012-10-08 02:56:32 -07:00
Alex Huang
fbdaa45276 Fixed more problems with aws 2012-10-08 00:57:12 -07:00
root
ef828127c2 fix build 2012-10-07 16:22:44 -07:00
frank
e4b88a707e CloudStack CLOUDSTACK-257
AWS Api is not correctly deployed

resolved fixed
2012-10-07 12:35:44 -07:00
David Nalley
384c03e425 Removing symlinks for CloudStack-248 and CloudStack-209
The problem that is described in both of those bugs is the deletion of files
installed by cloud-scripts.

What is happening is that instead of fixing the paths to scripts in places
where they are called, we tried to create a symlink in a %post section in
the RPM so that there was a symlink to the new directory for the scripts.
That does work (in new installs) but the problem that arises is that when
RPM is setting up the transation it doesn't know about the symlink (it's
in a %post, the symlinked directory is unowned from RPMs perspective, or
rather it is only owned by the cloud-agent-scripts package, which will
be removed.

So what happens is that cloud-agent-scripts puts things in /foo - we
come along to upgrade to 4.0 and that means we use cloud-scripts -
which puts things in /bar - so we install things into /bar (/foo still
exists at this point) then in a %post (and for the record, RPM doesn't
know what happens in a %pre, %post, %preun, or %postun - they are outside
the transation) we delete /foo and then create a symlink from /foo to /bar.
Then we get to the transaction part where we are ready to remove
cloud-agent-scripts - so it's time to delete /foo - except /foo is now a
symlink to /bar and thus we wipe out the contents of /foo and /bar in one
fell swoop.

To quote Bill Notting from Red Hat who pointed this out:
15:43 < notting> rpm decides what to do with all the files (update, remove,
or write new file) before the transaction. if the directory layout changes
*during* the transaction, weird shit happens.
2012-10-05 16:56:07 -07:00
Rohit Yadav
8ba6c8b171 CLOUDSTACK-248: Fix rpm build for cloud-scripts
Make rpm correctly handle new installs, upgrades and uninstalls.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-10-05 11:11:22 -07:00
frank
198f55f21f port to master
commit 318d2aedbd
Author: frank <frank.zhang@citrix.com>
Date:   Thu Jun 28 16:10:20 2012 -0700

    CS-15376
    Need to change rpm spec to deploy awsapi in its own webapps folder
2012-10-05 11:08:43 -07:00
Wido den Hollander
d9544a2fb9 rpm: Have cloud-server depend on cloud-scripts 2012-10-01 17:01:11 -07:00
Marcus Sorensen
8ed8b8b8b6 cloud.spec: run modprobe post agent install if kvm.modules exists
Signed-off-by: Edison Su <disheng.su@gmail.com>
2012-09-26 22:07:29 -07:00
Rohit Yadav
54fb0c3c61 RPM: Add copyright files to rpms
Adds rule to package toplevel LICENSE and NOTICE files to the doc path.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-26 21:34:38 -07:00
Chip Childers
ab87f9aea4 Corrected license of the usage package. 2012-09-25 15:15:41 -07:00
Rohit Yadav
16789a5ede CLOUDSTACK-189: Fix post install and post uninstall rules
Link over folder, instead of files.
Patch fixes install failure, in case user does not remove old
installation.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-25 15:06:25 -07:00
Rohit Yadav
ced75d0bb5 CLOUDSTACK-189: Fix install prefix change for rpms with symlinks
The install prefix for scripts and vms/systemvm.iso/zip has changed
from /usr/lib(32/64)/cloud/agent/ to /usr/lib(32/64)/cloud/common/

Patch fixes by symlinking paths for backward compatibility

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-24 10:20:52 -07:00
Edison Su
6bc71ac770 remove README.html in cloud.spec 2012-09-14 14:48:34 -07:00
Marcus Sorensen
29271a6c84 adding RPM dependency for cloud-agent
adding jakarta-commons-daemon as a dependency for cloud-agent. On fresh install was getting "Cannot find daemon loader
org/apache/commons/daemon/support/DaemonLoader"

Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-14 11:46:09 -07:00
Wido den Hollander
fed7938814 xen: Rename JAR file
cloud-xen.jar does not meet the namespace, so rename it to fit in
2012-09-13 23:19:48 +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
b892ff6630 Depend on libvirt-java 0.4.9 due to license change
0.4.9 switched from GPL to MIT
2012-09-13 16:29:01 +02:00
Edison Su
5e3921519a CLOUDSTACK-57, CLOUDSTACK-14
remove unnecessary build/deploy folder, and add CAStorSDK-1.3.1-CS40.jar into rpm/deb build system

Conflicts:

	debian/cloud-deps.install
	wscript_build
2012-09-12 20:47:20 -07:00
David Nalley
4b83c7f371 fixing rpm build 2012-09-12 17:51:43 -04:00
Hiroaki Kawai
739d4baf55 Patch from kawai@stratosphere.co.jp to resolve a Fedora dependency issue.
https://reviews.apache.org/r/7009/
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-11 10:13:52 -04:00
Edison.Su
52d8849003 fix rpm build 2012-09-10 22:33:41 -04:00
Edison.Su
1aa7a50cf2 fix rpm build 2012-09-10 19:51:16 -04:00
Mice Xia
55980c5338 remove mysql-connector-java.jar from rpm package 2012-09-10 23:37:29 +08:00
Mice Xia
6318e88c7d part of CLOUDSTACK-69 remove hibernate and its dependency from wscript_build and cloud.spec 2012-09-10 23:33:11 +08:00
Mice Xia
0d02e33d31 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-10 21:15:35 +08:00
Rajesh Battala
d9c03a55cf CLOUDSTACK-52 Fix for AWSAPI contains hibernate configurations https://reviews.apache.org/r/6967/diff/
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2012-09-10 17:58:16 +08:00
Chip Childers
d1d9cacbfb CLOUDSTACK-46 : Missed a reference to the mycloud setup script in cloud.spec 2012-09-07 14:43:41 -04:00
Edison Su
b88033ff2a fix installation issue 2012-09-07 05:12:27 -07:00
Edison Su
31bb7b8e56 fix rpm build 2012-09-06 19:19:46 -07:00
Edison Su
f26929bf2d add kvm into rpm 2012-09-06 11:41:01 -07:00
Edison Su
5ae15f8bbf first OSS build 2012-09-05 17:45:25 -07:00
Edison Su
caebc0ce74 fix rpm installation 2012-09-04 22:30:24 -07:00
Edison Su
c4955e82e8 fix rpmbuild 2012-09-04 21:34:52 -07:00