Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (4176044c73133b2df5274074170bf2f5a061e399)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (4176044c73133b2df5274074170bf2f5a061e399)
  • Date: Wed, 4 Mar 2009 11:51:55 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

disk/fuse/BUILD | 9 ++++++++-
disk/fuse/HISTORY | 4 ++++
disk/fuse/init.d/fuse | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
net/wicd/BUILD | 1 -
net/wicd/HISTORY | 4 +++-
net/wicd/INSTALL | 3 +--
6 files changed, 64 insertions(+), 5 deletions(-)

New commits:
commit 4176044c73133b2df5274074170bf2f5a061e399
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

fuse: no longer installs supplied init.d script, installs instead
smgl-style one

commit 94959a9bb6970023cd921b64312b1d981c268556
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

wicd: removed useless echo in BUILD (used to debug)
switched install process to default_install_python

diff --git a/disk/fuse/BUILD b/disk/fuse/BUILD
index c09c0ca..c8e90a4 100755
--- a/disk/fuse/BUILD
+++ b/disk/fuse/BUILD
@@ -3,4 +3,11 @@ then
OPTS="$OPTS --disable-mtab"
fi &&
OPTS="$OPTS --with-kernel=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version)"
&&
-default_build
+
+default_build_configure &&
+
+#patching generated Makefile to disable installation of init.d script
+sedit 's?\$(mkdir_p) \$(DESTDIR)\$(INIT_D_PATH)?#\$(mkdir_p)
\$(DESTDIR)\$(INIT_D_PATH)?' util/Makefile &&
+sedit 's?\$(INSTALL_PROGRAM) \$(srcdir)/init_script
\$(DESTDIR)\$(INIT_D_PATH)/fuse?#\$(INSTALL_PROGRAM) \$(srcdir)/init_script
\$(DESTDIR)\$(INIT_D_PATH)/fuse?' util/Makefile &&
+
+default_build_make
diff --git a/disk/fuse/HISTORY b/disk/fuse/HISTORY
index 811de59..4c1b53a 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,3 +1,7 @@
+2009-03-04 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * BUILD, init.d/fuse: spell no longer installs supplied init.d script,
+ instead installs smgl-style one
+
2009-01-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.8.0-pre2

diff --git a/disk/fuse/init.d/fuse b/disk/fuse/init.d/fuse
new file mode 100644
index 0000000..26c2c00
--- /dev/null
+++ b/disk/fuse/init.d/fuse
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+MOUNTPOINT="/sys/fs/fuse/connections"
+
+. /etc/init.d/smgl_init
+
+start() {
+ echo "Loading fuse module"
+ if ! grep -qw fuse /proc/filesystems; then
+ /sbin/modprobe fuse >/dev/null 2>&1
+ fi
+ evaluate_retval
+
+ echo "Mounting fuse control filesystem"
+ if grep -qw fusectl /proc/filesystems && ! grep -qw $MOUNTPOINT
/proc/mounts; then
+ /bin/mount -t fusectl fusectl $MOUNTPOINT >/dev/null 2>&1
+ fi
+ evaluate_retval
+}
+
+stop() {
+ echo "Unmounting fuse control filesystem"
+ if grep -qw $MOUNTPOINT /proc/mounts; then
+ /bin/umount $MOUNTPOINT >/dev/null 2>&1
+ fi
+ evaluate_retval
+
+ echo "Unloading fuse module"
+ if grep -qw "^fuse" /proc/modules; then
+ /sbin/rmmod fuse >/dev/null 2>&1
+ fi
+ evaluate_retval
+}
+
+reload() {
+ exit 3
+}
+
+status() {
+ echo -n "fuse filesystem is "
+ if ! grep -qw fuse /proc/filesystems; then
+ echo "not available."
+ else
+ echo "available."
+ fi
+}
diff --git a/net/wicd/BUILD b/net/wicd/BUILD
index a780693..5e11156 100755
--- a/net/wicd/BUILD
+++ b/net/wicd/BUILD
@@ -26,5 +26,4 @@ else
OPTS="--no-install-kde $OPTS"
fi &&

-echo $OPTS
python setup.py configure $OPTS
diff --git a/net/wicd/HISTORY b/net/wicd/HISTORY
index 2a41e1c..869e456 100644
--- a/net/wicd/HISTORY
+++ b/net/wicd/HISTORY
@@ -1,6 +1,8 @@
2009-03-03 Julien "_kaze_" ROZO <julien AT rozo.org>
* BUILD: fixed .desktop installation paths for KDE 3.x and 4.x,
- fixed .desktop installation path for KDE 4.x autostart
+ fixed .desktop installation path for KDE 4.x autostart,
+ removed useless echo
+ * INSTALL: switched install process to default_install_python

2009-02-26 Julien "_kaze_" ROZO <julien AT rozo.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS, INSTALL, HISTORY, init.d/wicd:
diff --git a/net/wicd/INSTALL b/net/wicd/INSTALL
index 9ac5900..46c6fba 100755
--- a/net/wicd/INSTALL
+++ b/net/wicd/INSTALL
@@ -1,2 +1 @@
-cd $SOURCE_DIRECTORY &&
-python setup.py install --root=${INSTALL_ROOT}/
+default_install_python



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (4176044c73133b2df5274074170bf2f5a061e399), Julien ROZO, 03/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page