From 08a30238244af86f4fa275b60adb31b2bbe1daa2 Mon Sep 17 00:00:00 2001 From: Emerson Pinter Date: Wed, 15 May 2013 09:30:12 -0300 Subject: [PATCH] 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. --- debian/cloudstack-awsapi.install | 6 +++++- debian/rules | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/cloudstack-awsapi.install b/debian/cloudstack-awsapi.install index 02ba66829ef..5734c43db2e 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 diff --git a/debian/rules b/debian/rules index 793771f684c..6bbebefa8d4 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