Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9e6705d80d3530562dd9404fbb30512d5b45b838)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9e6705d80d3530562dd9404fbb30512d5b45b838)
  • Date: Sat, 26 Jan 2013 11:30:18 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

cluster/ocfs2-tools/DEPENDS | 4 ++++
cluster/ocfs2-tools/DETAILS | 24 +++++++++++++++++++++++-
cluster/ocfs2-tools/HISTORY | 7 +++++++
cluster/ocfs2-tools/PREPARE | 2 ++
cluster/ocfs2-tools/PRE_BUILD | 6 ++++++
5 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit 9e6705d80d3530562dd9404fbb30512d5b45b838
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ocfs2-tools: added scm and 1.8 branches

diff --git a/cluster/ocfs2-tools/DEPENDS b/cluster/ocfs2-tools/DEPENDS
index 3fbe729..f09ecba 100755
--- a/cluster/ocfs2-tools/DEPENDS
+++ b/cluster/ocfs2-tools/DEPENDS
@@ -2,6 +2,10 @@ depends e2fsprogs &&
depends pkgconfig &&
depends glib2 &&

+if [[ $OCFS2_TOOLS_BRANCH != stable ]]; then
+ depends libaio
+fi &&
+
if list_find "$OCFS2_TOOLS_OPTS" "--enable-ocfs2console=yes"; then
depends python &&
depends pygtk2 &&
diff --git a/cluster/ocfs2-tools/DETAILS b/cluster/ocfs2-tools/DETAILS
index 9e61dab..b107da2 100755
--- a/cluster/ocfs2-tools/DETAILS
+++ b/cluster/ocfs2-tools/DETAILS
@@ -1,11 +1,33 @@
SPELL=ocfs2-tools
+if [[ $OCFS2_TOOLS_BRANCH == scm ]]; then
+ if [[ $OCFS2_TOOLS_AUTOUPDATE == y ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=scm
+ fi
+ FORCE_DOWNLOAD=on
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_URL[0]=git://oss.oracle.com/git/${SPELL}.git:${SPELL}-${VERSION}
+ SOURCE_IGNORE=volatile
+elif [[ $OCFS2_TOOLS_BRANCH == devel ]]; then
+ VERSION=1.8.2
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE2=${SOURCE}.sig
+ SOURCE_URL[0]=http://sourcemage.ru/mirror/$SOURCE
+ SOURCE_URL[1]=http://download.sourcemage.org/distro/$SOURCE
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+ SOURCE_GPG=gurus.gpg:$SOURCE2:WORKS_FOR_ME
+ SOURCE2_IGNORE=signature
+else
VERSION=1.6.4
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=http://oss.oracle.com/projects/${SPELL}/dist/files/source/v${BRANCH}/${SOURCE}

SOURCE_HASH=sha512:3b5b834e23467736b2fc522449f3d86b9a4b4764a66ec6812e4ecf497f8d43c2fb1aba1955c6030336d88463e720a5ace0b7cde48853cf3b482c6727ed86a649
+fi
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE=http://oss.oracle.com/projects/${SPELL}
+ WEB_SITE=http://oss.oracle.com/projects/ocfs2-tools/
ENTERED=20060711
LICENSE[0]=GPL
KEYWORDS="cluster filesystem"
diff --git a/cluster/ocfs2-tools/HISTORY b/cluster/ocfs2-tools/HISTORY
index a319720..b6b4e06 100644
--- a/cluster/ocfs2-tools/HISTORY
+++ b/cluster/ocfs2-tools/HISTORY
@@ -1,3 +1,10 @@
+2013-01-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added scm branch and latest release from devel (1.8) branch
+ (cloned from official git tag db4aef6, repacked and put to our
mirror)
+ * DEPENDS: unstable branches require libaio
+ * PREPARE: added, for branches selection
+ * PRE_BUILD: added, to generate configure script for scm branch
+
2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.6.4

diff --git a/cluster/ocfs2-tools/PREPARE b/cluster/ocfs2-tools/PREPARE
new file mode 100755
index 0000000..40600f7
--- /dev/null
+++ b/cluster/ocfs2-tools/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable devel scm
diff --git a/cluster/ocfs2-tools/PRE_BUILD b/cluster/ocfs2-tools/PRE_BUILD
new file mode 100755
index 0000000..e029178
--- /dev/null
+++ b/cluster/ocfs2-tools/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if [[ $OCFS2_TOOLS_BRANCH == scm ]]; then
+ autoreconf -fi
+fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9e6705d80d3530562dd9404fbb30512d5b45b838), Vlad Glagolev, 01/26/2013

Archive powered by MHonArc 2.6.24.

Top of Page