Updated Branches: refs/heads/4.1 1a83bf4b4 -> 08a302382
debian: fix build of cloudstack-awsapi package The debian package cloudstack-awsapi is being built empty. This patch adds the required files to the package and a symlink for webapps/awsapi so the awsapi can be found by tomcat, without change in configuration. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08a30238 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08a30238 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08a30238 Branch: refs/heads/4.1 Commit: 08a30238244af86f4fa275b60adb31b2bbe1daa2 Parents: 1a83bf4 Author: Emerson Pinter <[email protected]> Authored: Wed May 15 09:30:12 2013 -0300 Committer: Chip Childers <[email protected]> Committed: Mon May 20 16:35:51 2013 +0100 ---------------------------------------------------------------------- debian/cloudstack-awsapi.install | 6 +++++- debian/rules | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08a30238/debian/cloudstack-awsapi.install ---------------------------------------------------------------------- diff --git a/debian/cloudstack-awsapi.install b/debian/cloudstack-awsapi.install index 02ba668..5734c43 100644 --- a/debian/cloudstack-awsapi.install +++ b/debian/cloudstack-awsapi.install @@ -15,4 +15,8 @@ # specific language governing permissions and limitations # under the License. -/var/log/cloudstack/awsapi \ No newline at end of file +/var/log/cloudstack/awsapi +/usr/share/cloudstack-bridge/* +/usr/bin/cloudstack-aws-api-register +/usr/bin/cloudstack-setup-bridge +/usr/share/cloudstack-management/webapps7080/awsapi http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08a30238/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index 793771f..6bbebef 100755 --- a/debian/rules +++ b/debian/rules @@ -80,6 +80,7 @@ install: mkdir -p $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/ mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client + mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps7080 mkdir $(DESTDIR)/usr/share/$(PACKAGE)-management/setup mkdir $(DESTDIR)/var/log/$(PACKAGE)/management mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management @@ -153,6 +154,7 @@ install: mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup + ln -s /usr/share/$(PACKAGE)-bridge/webapps/awsapi $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps7080/awsapi cp -r awsapi/target/cloud-awsapi-$(VERSION)-SNAPSHOT/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi install -D awsapi-setup/setup/cloud-setup-bridge $(DESTDIR)/usr/bin/cloudstack-setup-bridge install -D awsapi-setup/setup/cloudstack-aws-api-register $(DESTDIR)/usr/bin/cloudstack-aws-api-register
