Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] SVK Change 9151 to grimoire.svk

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: root <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] SVK Change 9151 to grimoire.svk
  • Date: Fri, 2 Jun 2006 02:59:21 -0500

Group: defaults
Subject: r9151 - in test/disk: . sfs

Author: fbridault
Date: Mon May 29 06:24:52 2006
New Revision: 9151

Added:
test/disk/sfs/FINAL (contents, props changed)
test/disk/sfs/PREPARE (contents, props changed)
test/disk/sfs/PRE_BUILD (contents, props changed)
test/disk/sfs/sfs-gcc41.patch (contents, props changed)
Removed:
test/disk/sfs/POST_INSTALL
Modified:
test/disk/ (props changed)
test/disk/sfs/ (props changed)
test/disk/sfs/BUILD
test/disk/sfs/DEPENDS
test/disk/sfs/DETAILS
test/disk/sfs/HISTORY

Log:
r9161@Frodon: vlaaad | 1970-01-01 01:00:00 +0200
Integrate fix for bug #5824 from devel


Modified: test/disk/sfs/BUILD
==============================================================================
--- test/disk/sfs/BUILD (original)
+++ test/disk/sfs/BUILD Mon May 29 06:24:52 2006
@@ -1,5 +1,9 @@
-create_account sfs
+create_account sfs &&

+OPTS="$OPTS --with-gmp=/usr" &&
+#if [ "$SFS_CVS" == "y" ]; then
+ ./setup
+#fi &&
# needed for gcc 3.3
-sedit "s:-Werror::" configure &&
+sed -i "s:-Werror::" configure &&
default_build

Modified: test/disk/sfs/DEPENDS
==============================================================================
--- test/disk/sfs/DEPENDS (original)
+++ test/disk/sfs/DEPENDS Mon May 29 06:24:52 2006
@@ -1 +1 @@
-depends gmp '--with-gmp=/usr'
+depends gmp

Modified: test/disk/sfs/DETAILS
==============================================================================
--- test/disk/sfs/DETAILS (original)
+++ test/disk/sfs/DETAILS Mon May 29 06:24:52 2006
@@ -1,13 +1,28 @@
SPELL=sfs
- VERSION=0.7.2
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.fs.net/sfswww/dist/$SOURCE
-
SOURCE_HASH=sha512:5b46d67053bd6a5d7bd4ed00cd61c0f20bdeb0f50050035952c446bd6f7f8a87b56f32aeb886f1b1e3f4fc7047905681199b6f3032b5b6da18bd6c7e2a41c9a5
+#if [ "$SFS_CVS" == "y" ]; then
+ if [ "$SFS_CVS_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
+ SOURCE_URL[0]="cvs://:pserver:sfscvs AT cvs.fs.net:/cvs:sfs1"
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+#else
+# VERSION=0.7.2
+# SOURCE=$SPELL-$VERSION.tar.gz
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+# SOURCE_URL[0]=http://www.fs.net/sfswww/dist/$SOURCE
+#
SOURCE_HASH=sha512:5b46d67053bd6a5d7bd4ed00cd61c0f20bdeb0f50050035952c446bd6f7f8a87b56f32aeb886f1b1e3f4fc7047905681199b6f3032b5b6da18bd6c7e2a41c9a5
+#10c15
+# GCC_VERSION=33
+#fi
WEB_SITE=http://www.fs.net/
LICENSE[0]=GPL
ENTERED=20030705
- UPDATED=20030822
+ UPDATED=20030822
KEYWORDS="disk"
SHORT='Self-certifying File System (SFS)'
cat << EOF

Added: test/disk/sfs/FINAL
==============================================================================
--- (empty file)
+++ test/disk/sfs/FINAL Mon May 29 06:24:52 2006
@@ -0,0 +1,14 @@
+[ -d /etc/sfs ] || mkdir -p /etc/sfs
+[ -d /var/sfs ] || mkdir -p /var/sfs/root
+[ -d /var/sfs/authdb ] || mkdir -p /var/sfs/authdb
+chown -R sfs.sfs /var/sfs
+cat <<EOF >/etc/sfs/sfsrwsd_config.default
+Export /var/sfs/root /
+EOF
+[ -f /etc/sfs/sfsrwsd_config ] || cp /etc/sfs/sfsrwsd_config.default
/etc/sfs/sfsrwsd_config
+[ -f /etc/sfs/sfs_host_key ] || (
+# sfskey gen -P /etc/sfs/sfs_host_key
+ chown root /var/sfs/authdb
+ message "It seems you don't have yet a host key"
+ message "Please generate it using 'sfskey gen -P /etc/sfs/sfs_host_key'"
+)

Modified: test/disk/sfs/HISTORY
==============================================================================
--- test/disk/sfs/HISTORY (original)
+++ test/disk/sfs/HISTORY Mon May 29 06:24:52 2006
@@ -1,3 +1,19 @@
+2006-05-29 Flavien Bridault <vlaaad AT sourcemage.org>
+ * DETAILS, BUILD, DEPENDS: only compiles CVS version, "stable"
+ version is desperatly broken (bug #5824)
+ * FINAL: removed sfs host key generation, ask the user to do it
+ if it is not present (bug #5824)
+ * PREPARE: prompt for cvs autoupdate
+ * PRE_BUILD: added to apply patch below
+ * sfs-gcc41.patch: correct compiling with gcc4.1
+
+2006-04-06 Flavien Bridault <vlaaad AT sourcemage.org>
+ * BUILD: added commands to compile CVS version
+ * POST_INSTALL: removed
+ * FINAL: added, taking code from POST_INSTALL
+ * DETAILS: allow to compile CVS version
+ * DEPENDS: depends either on gcc33 or gcc34
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


Deleted: test/disk/sfs/POST_INSTALL
==============================================================================
--- test/disk/sfs/POST_INSTALL Mon May 29 06:24:52 2006
+++ (empty file)
@@ -1,11 +0,0 @@
-[ -d /etc/sfs ] || mkdir -p /etc/sfs
-[ -d /var/sfs ] || mkdir -p /var/sfs/root
-chown -R sfs.sfs /var/sfs
-cat <<EOF >/etc/sfs/sfsrwsd_config.default
-Export /var/sfs/root /
-EOF
-[ -f /etc/sfs/sfsrwsd_config ] || cp /etc/sfs/sfsrwsd_config.default
/etc/sfs/sfsrwsd_config
-[ -f /etc/sfs/sfs_host_key ] || (
- sfskey gen -P /etc/sfs/sfs_host_key
- chown root /var/sfs/authdb
-)

Added: test/disk/sfs/PREPARE
==============================================================================
--- (empty file)
+++ test/disk/sfs/PREPARE Mon May 29 06:24:52 2006
@@ -0,0 +1,2 @@
+config_query SFS_CVS_AUTOUPDATE \
+ "Update to the latest CVS automatically on every cast?" n

Added: test/disk/sfs/PRE_BUILD
==============================================================================
--- (empty file)
+++ test/disk/sfs/PRE_BUILD Mon May 29 06:24:52 2006
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/sfs-gcc41.patch

Added: test/disk/sfs/sfs-gcc41.patch
==============================================================================
--- (empty file)
+++ test/disk/sfs/sfs-gcc41.patch Mon May 29 06:24:52 2006
@@ -0,0 +1,36 @@
+diff -uNr sfs-cvs.old/adb/indexNode.h sfs-cvs/adb/indexNode.h
+--- sfs-cvs.old/adb/indexNode.h 2006-05-29 12:40:31.000000000 +0200
++++ sfs-cvs/adb/indexNode.h 2006-05-29 12:52:41.000000000 +0200
+@@ -71,7 +71,7 @@
+
+ public:
+ indexNode(nodeStorage *buf, btree* tree, int size);
+- indexNode::~indexNode();
++ ~indexNode();
+
+ void insert(record *item, int policy, callback<void, int>::ref cb);
+ void remove(void *key, bSize_t len);
+diff -uNr sfs-cvs.old/adb/nodeBuf.h sfs-cvs/adb/nodeBuf.h
+--- sfs-cvs.old/adb/nodeBuf.h 2006-05-29 12:40:31.000000000 +0200
++++ sfs-cvs/adb/nodeBuf.h 2006-05-29 12:42:10.000000000 +0200
+@@ -87,7 +87,7 @@
+
+ int idToOffset(nodeID_t id);
+ nodeID_t blockToID(blockID_t b);
+- blockID_t nodeBuf::IDToBlock(nodeID_t n);
++ blockID_t IDToBlock(nodeID_t n);
+
+ void verifySpace(bSize_t nsize);
+ void initNode(void* buf, char, blockID_t, nodeID_t, bSize_t);
+diff -uNr sfs-cvs.old/adb/record.h sfs-cvs/adb/record.h
+--- sfs-cvs.old/adb/record.h 2006-05-29 12:40:31.000000000 +0200
++++ sfs-cvs/adb/record.h 2006-05-29 12:41:47.000000000 +0200
+@@ -35,7 +35,7 @@
+
+ public:
+ record(void *key, int keyLen, void *value, int valueLen);
+- record::record(record *rec);
++ record(record *rec);
+ ~record();
+ void dealloc();
+ void *getKey(bSize_t *len);



  • [SM-Commit] SVK Change 9151 to grimoire.svk, root, 06/02/2006

Archive powered by MHonArc 2.6.24.

Top of Page