[SM-Commit] PERFORCE change 77343 by Flavien Bridault for review

Perforce Review Daemon p4review at smee.org
Thu Apr 6 08:15:00 EDT 2006


Change 77343 by flavien_bridault at flavien-Gargamel on 2006/04/06 13:11:21

	sfs WIP, see http://bugs.sourcemage.org/show_bug.cgi?id=5824 for more details

Affected files ...

... //sgl/grimoires/devel/disk/sfs/BUILD#3 edit
... //sgl/grimoires/devel/disk/sfs/DEPENDS#3 edit
... //sgl/grimoires/devel/disk/sfs/DETAILS#6 edit
... //sgl/grimoires/devel/disk/sfs/FINAL#2 edit
... //sgl/grimoires/devel/disk/sfs/HISTORY#5 edit
... //sgl/grimoires/devel/disk/sfs/WIP#2 edit

Differences ...

==== //sgl/grimoires/devel/disk/sfs/BUILD#3 (xtext) ====

@@ -1,58 +1,9 @@
-#------------------------------------------------------
-##
-## Force the system to use gcc33
-##
-## I really don't understand what this code does.
-##
-## Copied from libgcc2 from sorcery
-##
-##
-#------------------------------------------------------
+create_account sfs  &&
 
-
-#---------------------------------------------------------------------
-## @param new path to add
-## @param old path
-## @Stdout new path
-## Echos the old path with new path prepended, separated with a ':'
-#---------------------------------------------------------------------
-function gcc33_prepend_path()  {
-
-  if    test  -z  $2
-  then  echo $1
-  else  echo $1:$2
-  fi
-
-}
-
-#---------------------------------------------------------------------
-## @param path
-##
-## Alters the environment so that gcc33 will be used for compiling and
-## building spells when the "gcc" command is used.
-##
-#---------------------------------------------------------------------
-function gcc33_add_paths()  {
-
-  export  PATH=$(  gcc33_prepend_path  $1/bin  $PATH  )
-  export  LD_LIBRARY_PATH=$(  gcc33_prepend_path  $1/lib  $LD_LIBRARY_PATH  )
-  export  LD_RUN_PATH=$(  gcc33_prepend_path  $1/lib  $LD_RUN_PATH  )
-  export  INFOPATH=$(  gcc33_prepend_path  $1/info  $INFOPATH  )
-  export  CPPFLAGS="-I $1/include  $CPPFLAGS"
-
-}
-
-gcc33_add_paths  /opt/gcc33
-echo  "Using gcc version: `gcc  -dumpversion`"
-
-#---------------------------------------------------------------------
-##
-## End Messy USEGCC33 hack
-##
-#---------------------------------------------------------------------
-
-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

==== //sgl/grimoires/devel/disk/sfs/DEPENDS#3 (xtext) ====

@@ -1,2 +1,6 @@
-depends gmp '--with-gmp=/usr'	&&
-depends gcc33
+depends gmp  &&
+if  [ "$SFS_CVS" == "y" ];  then
+  depends gcc34
+else
+  depends gcc33
+fi

==== //sgl/grimoires/devel/disk/sfs/DETAILS#6 (xtext) ====

@@ -1,14 +1,31 @@
            SPELL=sfs
+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@cvs.fs.net:/cvs:sfs1"
+   SOURCE_IGNORE=volatile
+  FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+     GCC_VERSION=34
+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
 SFS is a secure, global network file system with completely decentralized control. SFS

==== //sgl/grimoires/devel/disk/sfs/FINAL#2 (xtext) ====

@@ -1,5 +1,6 @@
 [ -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 /

==== //sgl/grimoires/devel/disk/sfs/HISTORY#5 (text) ====

@@ -1,3 +1,10 @@
+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
 

==== //sgl/grimoires/devel/disk/sfs/WIP#2 (text) ====

@@ -1,3 +1,10 @@
 Trying to resolve http://bugs.sourcemage.org/show_bug.cgi?id=5824
-Current version does not compile with gcc3.4, nor CVS version
+Current version does not compile with gcc3.3, CVS version is ok
+
+Have to find a workaround to pass something to "sfskey gen -P /etc/sfs/sfs_host_key" so that
+it doesn't wait for a user prompt.
+
+echo "foo
+foofoofoofoo" | sfskey gen -P /etc/sfs/sfs_host_key
 
+doesn't work



More information about the SM-Commit mailing list