[SCM] CTDB repository - branch master updated - ctdb-1.13-340-gceac026

[Amitay Isaacs]

The branch, master has been updated
       via  ceac026713a7ee30ea865ed4a9422900ed76fdf6 (commit)
       via  aad1584da8a8425bc6f5163c95810e9d2390dc91 (commit)
      from  16a91c2a4d03b46743611e2fe844bb2cef95e46a (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ceac026713a7ee30ea865ed4a9422900ed76fdf6
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Oct 31 12:17:27 2012 +1100

    web: Update instructions for building from tarball
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

commit aad1584da8a8425bc6f5163c95810e9d2390dc91
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Oct 31 12:10:22 2012 +1100

    tests: Do not check release suffix in ctdb version test
    
    release suffix added by RPM is to track packaging changes. Core CTDB
    version does not include the release suffix.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 tests/simple/01_ctdb_version.sh |    3 ++-
 web/building.html               |   10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/simple/01_ctdb_version.sh b/tests/simple/01_ctdb_version.sh
index 5a36ea4..3e1ed3e 100755
--- a/tests/simple/01_ctdb_version.sh
+++ b/tests/simple/01_ctdb_version.sh
@@ -39,8 +39,9 @@ if ! try_command_on_node -v 0 "rpm -q ctdb" ; then
 fi
 rpm_ver="${out#ctdb-}"
 # Some version of RPM append the architecture to the version.
+# And also remove the release suffix.
 arch=$(uname -m)
-rpm_ver="${rpm_ver%.${arch}}"
+rpm_ver="${rpm_ver%-*.${arch}}"
 
 try_command_on_node -v 0 "$CTDB version"
 ctdb_ver="${out#CTDB version: }"
diff --git a/web/building.html b/web/building.html
index fc4789c..7475078 100644
--- a/web/building.html
+++ b/web/building.html
@@ -4,7 +4,7 @@
 <H2 align="center">Building CTDB and Samba</h2>
 
 <h2>CTDB</h2>
-To build a copy of the CTDB code you should do this:
+To build a copy of CTDB code from a git tree you should do this:
 <pre>
    cd ctdb
    ./autogen.sh
@@ -13,6 +13,14 @@ To build a copy of the CTDB code you should do this:
    make install
 </pre>
 
+To build a copy of CTDB code from a tarball you should do this:
+<pre>
+   tar xf ctdb-x.y.tar.gz
+   cd ctdb-x.y
+   ./configure
+   make
+   make install
+</pre>
 You need to install ctdb on all nodes of your cluster.
 
 


-- 
CTDB repository