Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jeremy Kajikawa (6d9c45e07ea2d68459c841d8e2e91b307516a2b9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Kajikawa <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jeremy Kajikawa (6d9c45e07ea2d68459c841d8e2e91b307516a2b9)
  • Date: Fri, 3 Jun 2011 14:59:51 -0500

GIT changes to master grimoire by Jeremy Kajikawa <Belxjander AT gmail.com>:

disk/fuse/DETAILS | 2 +-
disk/fuse/HISTORY | 4 ++++
disk/fuse/PRE_BUILD | 3 +++
3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 6d9c45e07ea2d68459c841d8e2e91b307516a2b9
Author: Jeremy Kajikawa <Belxjander AT gmail.com>
Commit: Jeremy Kajikawa <Belxjander AT gmail.com>

Revert "new files:"
This reverts commit a635ca906741db0dcd2725fcf5fa4502693b98a4.

Updating the systemd spell and relocating it to a new development branch
the spell was not intended for "test" grimoire "master" but
to be created into a "devel-systemd" branch

Additionally the original commit comment was in error and not as
informative as required.

Jeremy Kajikawa

commit fff650aae36d5fb1e31909aef12f98ffba604709
Author: Jeremy Kajikawa <Belxjander AT gmail.com>
Commit: Jeremy Kajikawa <Belxjander AT gmail.com>

Revert "Revert "fix fuse with glibc-2.14""
This reverts commit 92ee5e1d35f4fd8bec8f0b6dcb859a4011f5ba90.

I should never have touched this!!! - Jeremy Kajikawa
part of my systemd mess cleanup under tutelage...

commit 592d6d090f7e9e4ce1c82a0d04091b4f19ee9df1
Author: Jeremy Kajikawa <Belxjander AT gmail.com>
Commit: Jeremy Kajikawa <Belxjander AT gmail.com>

Revert "Revert "new files:""
This reverts commit 2de12a55f16621859b023172296735513bb0af52.

I am trying to clean up after an initial incorrect commit of
the systemd spell.

Jeremy Kajikawa

diff --git a/disk/fuse/DETAILS b/disk/fuse/DETAILS
index 278be17..87e230e 100755
--- a/disk/fuse/DETAILS
+++ b/disk/fuse/DETAILS
@@ -1,7 +1,7 @@
SPELL=fuse
if [ "$CVS" != "y" ]; then
VERSION=2.8.5
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:83f668c5c02f591a1f6e5cb6f95abb7227248ba80fab940395ee5ec07ce44743dae07c3cfd865327143fe5cbe3bbee4aa1c4e856e55aa80cb8b6892f9683efad
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index c93d9bf..fa68082 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,7 @@
+2011-06-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: fix for latest glibc
+
2011-05-14 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 8dd8ec1..d635a2a 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -4,6 +4,9 @@ cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/init.patch" &&

+# glibc-2.14 fix
+sed -i "/sched/s|<|<linux/|" util/fusermount.c &&
+
if [ "$CVS" = "y" ]; then
./makeconf.sh
fi



  • [SM-Commit] GIT changes to master grimoire by Jeremy Kajikawa (6d9c45e07ea2d68459c841d8e2e91b307516a2b9), Jeremy Kajikawa, 06/03/2011

Archive powered by MHonArc 2.6.24.

Top of Page