Updated README to list new requirements. Set default hash as crc32. Set default digests as sha1/md5.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@983 d1e1f19c-881f-0410-ab34-b69fee027534

3 files changed, 26 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index c9d113ee..62359252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.470 2005/12/19 20:53:13 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.471 2005/12/19 21:19:11 wolf31o2 Exp $
+
+  19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> README,
+  files/catalyst.conf:
+  Updated README to list new requirements. Set default hash as crc32. Set
+  default digests as sha1/md5.
 
   19 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst, files/catalyst.conf,
   modules/catalyst_support.py, modules/generic_stage_target.py,
diff --git a/README b/README
index e3341bc5..1493eff9 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/README,v 1.13 2005/04/20 20:45:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/README,v 1.14 2005/12/19 21:19:11 wolf31o2 Exp $
 
 Licensing
 ========================
@@ -18,9 +18,12 @@ your own risk.
 Requirements
 =======================
 
-- Python 2.3 or greater
-- A portage snapshot
+- Python 2.4 or greater (may still work with 2.3)
+- A portage snapshot (or portage tree to make your own)
 - A Gentoo seed stage tarball
+- md5sum/sha1sum for simple digesting (MD5/SHA1)
+- Archive-Zip for CRC32 checking
+- shash for advanced digesting (SHA224 RIPEMD128 RIPEMD320 SHA384 RIPEMD256 SHA256 SHA512 RIPEMD160
 
 What is Catalyst?
 ========================
diff --git a/files/catalyst.conf b/files/catalyst.conf
index 14fa783f..135670a7 100644
--- a/files/catalyst.conf
+++ b/files/catalyst.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.20 2005/12/19 20:53:13 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.21 2005/12/19 21:19:11 wolf31o2 Exp $
 
 # Simple desriptions of catalyst settings. Please refer to the online
 # documentation for more information.
@@ -24,8 +24,8 @@ distdir="/usr/portage/distfiles"
 # seedcache = use the build output of a previous target if it exists to speed up
 #	the copy
 # snapcache = cache the snapshot so that it can be bind-mounted into the chroot.
-#  WARNING: moving parts of the portage tree from within fsscript *will* break
-#  your cache.  The cache is unlinked before any empty or rm processing, though.
+#	WARNING: moving parts of the portage tree from within fsscript *will* break
+#	your cache. The cache is unlinked before any empty or rm processing, though.
 #
 # (These options can be used together)
 options="autoresume kerncache pkgcache seedcache snapcache"
@@ -45,17 +45,18 @@ storedir="/var/tmp/catalyst"
 # enabled in the options.
 # snapshot_cache="<path_to_new_cache_dir>"
 
-# Internal hash function catalyst should use for things like autoresume,seedcache,etc.
-# crc32 is the default and fastest.  You shouldnt ever need to change this unless your os
-# doesnt support it.
-# Supported options: sha1, sha224, ripemd128, ripemd320, sha384, crc32, ripemd256, sha256, sha512, ripemd160, md5
-# hash_function="crc32"
+# Internal hash function catalyst should use for things like autoresume, 
+# seedcache, etc.  The default and fastest is crc32.  You should not ever need
+# to change this unless your OS does not support it.
+# Supported options: sha1, sha224, ripemd128, ripemd320, sha384, crc32,
+#	ripemd256, sha256, sha512, ripemd160, md5
+hash_function="crc32"
 
-# DIGESTS CREATION
-# Creates a .digests file containing the hash output from any of the supported options below.  Adding them all
-# May take a long time.
-# Supported options: sha1, sha224, ripemd128, ripemd320, sha384, crc32, ripemd256, sha256, sha512, ripemd160, md5
-# digests="sha1 sha224 ripemd128 ripemd320 sha384 crc32 ripemd256 sha256 sha512 ripemd160 md5"
+# Creates a .digests file containing the hash output from any of the supported
+# options below.  Adding them all may take a long time.
+# Supported options: sha1, sha224, ripemd128, ripemd320, sha384, crc32,
+#	ripemd256, sha256, sha512, ripemd160, md5
+digests="md5 sha1"
 
 # envscript allows users to set options such as http proxies, MAKEOPTS,
 # GENTOO_MIRRORS, or any other environment variables needed for building.