You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/06/22 10:24:19 UTC

[1/2] git commit: updated refs/heads/4.1 to 7e56b40

Updated Branches:
  refs/heads/4.1 d3c181efa -> 7e56b401c


RPM build - run mvn clean before building packages, to get a build from fresh source

Signed-off-by: Marcus Sorensen <ma...@betterservers.com> 1369936033 -0600
(cherry picked from commit 800cd391d5ff2baf02f7eed137f4f50edb126a4c)

Conflicts:
	packaging/centos63/cloud.spec


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a960d88
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a960d88
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a960d88

Branch: refs/heads/4.1
Commit: 9a960d88fce99f7adf9083d2c8fc82448f488349
Parents: d3c181e
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Thu May 30 11:47:13 2013 -0600
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jun 22 10:48:01 2013 +0530

----------------------------------------------------------------------
 packaging/centos63/cloud.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a960d88/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index d065037..3d0a789 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -165,10 +165,12 @@ echo PACKAGE=%{name} >> build/replace.properties
 
 if [ "%{_ossnoss}" == "NONOSS" -o "%{_ossnoss}" == "nonoss" ] ; then
     echo "Executing mvn packaging for NONOSS ..."
-	mvn -P awsapi,systemvm -Dnonoss package
+   mvn clean
+   mvn -Pawsapi,systemvm -Dnonoss package
 else
     echo "Executing mvn packaging for OSS ..."
-	mvn -P awsapi package -Dsystemvm
+   mvn clean
+   mvn -Pawsapi package -Dsystemvm
 fi
 
 %install


[2/2] git commit: updated refs/heads/4.1 to 7e56b40

Posted by ts...@apache.org.
mvn clean does not do a complete clean

Retains the systevm.iso from the previous run causing systemvm.iso to
never update itself. Do a complete clean install for all profiles
specified in mvn.

Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 55db2fe6d12338bcd5b4860aaaa52e37a9cad174)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e56b401
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e56b401
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e56b401

Branch: refs/heads/4.1
Commit: 7e56b401cf234733acd615cae699466cdcabb979
Parents: 9a960d8
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon Jun 3 14:05:15 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jun 22 10:48:41 2013 +0530

----------------------------------------------------------------------
 packaging/centos63/cloud.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e56b401/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 3d0a789..0de5f5d 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -164,13 +164,11 @@ echo VERSION=%{_maventag} >> build/replace.properties
 echo PACKAGE=%{name} >> build/replace.properties
 
 if [ "%{_ossnoss}" == "NONOSS" -o "%{_ossnoss}" == "nonoss" ] ; then
-    echo "Executing mvn packaging for NONOSS ..."
-   mvn clean
-   mvn -Pawsapi,systemvm -Dnonoss package
+   echo "Executing mvn packaging for NONOSS ..."
+   mvn -Pawsapi,systemvm -Dnonoss package clean install
 else
-    echo "Executing mvn packaging for OSS ..."
-   mvn clean
-   mvn -Pawsapi package -Dsystemvm
+   echo "Executing mvn packaging for OSS ..."
+   mvn -Pawsapi package -Dsystemvm clean install
 fi
 
 %install