Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (2f78636d21727218c74284b662fad5ff481b9aa7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (2f78636d21727218c74284b662fad5ff481b9aa7)
  • Date: Mon, 23 Jul 2012 00:45:02 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

disk/fuse/HISTORY | 3 +++
disk/fuse/PRE_BUILD | 16 +++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 2f78636d21727218c74284b662fad5ff481b9aa7
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

disk/fuse: unlock.patch now applies to stable branch only

diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 4abdced..86811ba 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,6 @@
+2012-07-23 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_BUILD: unlock.patch now applies to stable branch only
+
2012-05-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply the patch
diff --git a/disk/fuse/PRE_BUILD b/disk/fuse/PRE_BUILD
index c677cfb..dc1471d 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -2,17 +2,15 @@ default_pre_build &&

cd "$SOURCE_DIRECTORY" &&

-# part of revert of official commit 3743f3fe
-# that brakes our castfs staging system
-patch -p1 < "$SPELL_DIRECTORY/unlock.patch" &&
-
-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 [ "$FUSE_BRANCH" = "scm" ]; then
+if [ "$FUSE_BRANCH" != "scm" ]; then
+ # part of revert of official commit 3743f3fe
+ # that brakes our castfs staging system
+ patch -p1 < "$SPELL_DIRECTORY/unlock.patch"
+ # prevent installing fuse initscript into the wrong place
+ patch -p0 < "$SPELL_DIRECTORY/init.patch"
+else
./makeconf.sh
fi



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (2f78636d21727218c74284b662fad5ff481b9aa7), Pol Vinogradov, 07/23/2012

Archive powered by MHonArc 2.6.24.

Top of Page