You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/02/13 08:27:35 UTC
git commit: refs/heads/master - console-proxy: Fix broken build
system due to console-proxy moves
Updated Branches:
refs/heads/master ae2b673e0 -> 9fd09a7f5
console-proxy: Fix broken build system due to console-proxy moves
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9fd09a7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9fd09a7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9fd09a7f
Branch: refs/heads/master
Commit: 9fd09a7f5fe732a888f10c1dfffb9de28e485ae1
Parents: ae2b673
Author: Rohit Yadav <bh...@apache.org>
Authored: Wed Feb 13 12:40:30 2013 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Wed Feb 13 12:56:40 2013 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 4 ++--
pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9fd09a7f/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 2577cd0..a90fde9 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -181,8 +181,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/
cp -r scripts/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts
-install -D console-proxy/dist/systemvm.iso ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.iso
-install -D console-proxy/dist/systemvm.zip ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.zip
+install -D services/console-proxy/server/dist/systemvm.iso ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.iso
+install -D services/console-proxy/server/dist/systemvm.zip ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.zip
install python/lib/cloud_utils.py ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloud_utils.py
cp -r python/lib/cloudutils ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/
python -m py_compile ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloud_utils.py
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9fd09a7f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f7aaf95..a9209c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -361,7 +361,7 @@
<exclude>**/target/**</exclude>
<exclude>**/.vagrant</exclude>
<exclude>build/build.number</exclude>
- <exclude>console-proxy/js/jquery.js</exclude>
+ <exclude>services/console-proxy/server/js/jquery.js</exclude>
<exclude>debian/compat</exclude>
<exclude>debian/control</exclude>
<exclude>debian/dirs</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9fd09a7f/services/console-proxy/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 58fd62a..71e8393 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -111,7 +111,7 @@
</includes>
</resource>
<resource>
- <directory>../patches/systemvm/debian/config/root/.ssh</directory>
+ <directory>../../../patches/systemvm/debian/config/root/.ssh</directory>
<includes>
<include>authorized_keys</include>
</includes>