Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (16aca06f0ddba0371eaf123d04a0a56acb922319)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (16aca06f0ddba0371eaf123d04a0a56acb922319)
  • Date: Mon, 19 Sep 2011 21:07:01 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

disk/fuse/BUILD | 2 +-
disk/fuse/DEPENDS | 2 +-
disk/fuse/DETAILS | 4 ++--
disk/fuse/HISTORY | 3 +++
disk/fuse/PREPARE | 9 ++-------
disk/fuse/PRE_BUILD | 4 ++--
6 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 16aca06f0ddba0371eaf123d04a0a56acb922319
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fuse: Use prepare_select_branch

diff --git a/disk/fuse/BUILD b/disk/fuse/BUILD
index 4538a62..7341d05 100755
--- a/disk/fuse/BUILD
+++ b/disk/fuse/BUILD
@@ -1,4 +1,4 @@
-if [[ $CVS == y ]]; then
+if [[ $FUSE_BRANCH == scm ]]; then
OPTS="$OPTS --disable-mtab"
fi &&

diff --git a/disk/fuse/DEPENDS b/disk/fuse/DEPENDS
index ad21194..1e010b1 100755
--- a/disk/fuse/DEPENDS
+++ b/disk/fuse/DEPENDS
@@ -1,3 +1,3 @@
-if [ "$CVS" = "y" ]; then
+if [ "$FUSE_BRANCH" = "scm" ]; then
depends git
fi
diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 1823798..f581427 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,5 +1,5 @@
SPELL=fuse
-if [ "$CVS" != "y" ]; then
+if [ "$FUSE_BRANCH" != "scm" ]; then
VERSION=2.8.6
PATCHLEVEL=0

SOURCE_HASH=sha512:03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
@@ -7,7 +7,7 @@ if [ "$CVS" != "y" ]; then
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- if [ "$FUSE_CVS_AUTOUPDATE" == "y" ]; then
+ if [ "$FUSE_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
else
VERSION=git
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index cd1de30..d9cac26 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2011-09-20 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD: Use
prepare_select_branch
+
2011-09-18 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.8.6

diff --git a/disk/fuse/PREPARE b/disk/fuse/PREPARE
index 5173cad..98d27e4 100755
--- a/disk/fuse/PREPARE
+++ b/disk/fuse/PREPARE
@@ -1,7 +1,2 @@
-config_query CVS "Use git version?" n &&
-
-if [ "$CVS" == "y" ]; then
- config_query FUSE_CVS_AUTOUPDATE \
- "Update to the latest git automatically on every cast?" \
- n
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index e16f051..a2bb535 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -2,13 +2,13 @@ default_pre_build &&

cd "$SOURCE_DIRECTORY" &&

-if [ "$CVS" != "y" ]; then
+if [ "$FUSE_BRANCH" != "scm" ]; then
patch -p0 < "$SPELL_DIRECTORY/init.patch"
fi &&

# glibc-2.14 fix
sed -i "/sched/s|<|<linux/|" util/fusermount.c &&

-if [ "$CVS" = "y" ]; then
+if [ "$FUSE_BRANCH" = "scm" ]; then
./makeconf.sh
fi



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (16aca06f0ddba0371eaf123d04a0a56acb922319), Ismael Luceno, 09/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page