Skip to Content.
Sympa Menu

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

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 (2de12a55f16621859b023172296735513bb0af52)
  • Date: Fri, 3 Jun 2011 14:22:03 -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 ---
smgl/systemd/BUILD | 23 -----------------------
smgl/systemd/CONFLICTS | 3 ---
smgl/systemd/DEPENDS | 2 --
smgl/systemd/DETAILS | 27 ---------------------------
smgl/systemd/HISTORY | 3 ---
smgl/systemd/PREPARE | 1 -
smgl/systemd/PRE_BUILD | 2 --
smgl/systemd/PROVIDES | 1 -
smgl/systemd/UP_TRIGGERS | 2 --
12 files changed, 1 insertion(+), 72 deletions(-)

New commits:
commit 2de12a55f16621859b023172296735513bb0af52
Author: Jeremy Kajikawa <Belxjander AT gmail.com>
Commit: Jeremy Kajikawa <Belxjander AT gmail.com>

Revert "new files:"

This reverts commit a635ca906741db0dcd2725fcf5fa4502693b98a4.

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

Revert "fix fuse with glibc-2.14"

This reverts commit 6d923f2df7b5f7794b8a1cbde7c1993da7423211.

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

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 fa68082..c93d9bf 100644
--- a/disk/fuse/HISTORY
+++ b/disk/fuse/HISTORY
@@ -1,7 +1,3 @@
-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 d635a2a..8dd8ec1 100755
--- a/disk/fuse/PRE_BUILD
+++ b/disk/fuse/PRE_BUILD
@@ -4,9 +4,6 @@ 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
diff --git a/smgl/systemd/BUILD b/smgl/systemd/BUILD
deleted file mode 100755
index 05593aa..0000000
--- a/smgl/systemd/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-if [[ $SYSTEMD_GIT == y ]]
-then
- ./autogen.sh --prefix=${INSTALL_ROOT}/ \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- --includedir=${INSTALL_ROOT}/usr/include \
- --localedir=${INSTALL_ROOT}/usr/share/locale \
- --with-distro=other \
- $OPTS
-else
- ./configure --prefix=${INSTALL_ROOT}/ \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- --includedir=${INSTALL_ROOT}/usr/include \
- --localedir=${INSTALL_ROOT}/usr/share/locale \
- --with-distro=other \
- $OPTS
-fi
-make
diff --git a/smgl/systemd/CONFLICTS b/smgl/systemd/CONFLICTS
deleted file mode 100755
index a3d06f2..0000000
--- a/smgl/systemd/CONFLICTS
+++ /dev/null
@@ -1,3 +0,0 @@
-#conflicts simpleinit-msb &&
-conflicts initng &&
-conflicts upstart
diff --git a/smgl/systemd/DEPENDS b/smgl/systemd/DEPENDS
deleted file mode 100755
index dcd27ae..0000000
--- a/smgl/systemd/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends udev &&
-depends dbus
diff --git a/smgl/systemd/DETAILS b/smgl/systemd/DETAILS
deleted file mode 100644
index ac6630d..0000000
--- a/smgl/systemd/DETAILS
+++ /dev/null
@@ -1,27 +0,0 @@
- SPELL=systemd
-if [[ $SYSTEMD_GIT == y ]]
-then
- VERSION=git
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_IGNORE=volatile
- SOURCE_URL[0]=git://anongit.freedesktop.org/systemd
- FORCE_DOWNLOAD=1
-else
- VERSION=26
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_HASH=sha512:
-
SOURCE_URL[0]=http://www.freedesktop.org/software/${SPELL}/${SPELL}-${VERSION}.tar.bz2
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
- ENTERED=20110406
- LICENSE[0]=GPL
- SHORT="systemd is a system and service manager for Linux"
-cat << EOF
-systemd is a system and service manager for Linux, compatible with SysV and
LSB init scripts.
-systemd provides aggressive parallelization capabilities, uses socket and
D-Bus activation for starting services,
-offers on-demand starting of daemons, keeps track of processes using Linux
cgroups,
-supports snapshotting and restoring of the system state, maintains mount and
automount points and
-implements an elaborate transactional dependency-based service control logic.
-It can work as a drop-in replacement for sysvinit.
-EOF
diff --git a/smgl/systemd/HISTORY b/smgl/systemd/HISTORY
deleted file mode 100644
index dda41d0..0000000
--- a/smgl/systemd/HISTORY
+++ /dev/null
@@ -1,3 +0,0 @@
-2011-04-06 Jeremy Kajikawa <Belxjander AT sourcemage.org>
- * DETAILS,BUILD,HISTORY: created spell
-
diff --git a/smgl/systemd/PREPARE b/smgl/systemd/PREPARE
deleted file mode 100755
index 52ae65b..0000000
--- a/smgl/systemd/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SYSTEMD_GIT "Use git version?" n
diff --git a/smgl/systemd/PRE_BUILD b/smgl/systemd/PRE_BUILD
deleted file mode 100755
index 92c592c..0000000
--- a/smgl/systemd/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY}
diff --git a/smgl/systemd/PROVIDES b/smgl/systemd/PROVIDES
deleted file mode 100755
index d0e366a..0000000
--- a/smgl/systemd/PROVIDES
+++ /dev/null
@@ -1 +0,0 @@
-INIT
diff --git a/smgl/systemd/UP_TRIGGERS b/smgl/systemd/UP_TRIGGERS
deleted file mode 100644
index d304c5c..0000000
--- a/smgl/systemd/UP_TRIGGERS
+++ /dev/null
@@ -1,2 +0,0 @@
-up_trigger udev cast_self
-up_trigger dbus cast_self



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

Archive powered by MHonArc 2.6.24.

Top of Page