Re-arranged catalyst.conf to make it easier to follow while looking at the online...

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

diff --git a/ChangeLog b/ChangeLog
index d06bd3266e591acb34c4b9dbfba7d283b186525e..9caaad40b32ae188828dc3558a0f2fdda18e137b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  30 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf,
+  +files/catalystrc, modules/catalyst_support.py:
+  Re-arranged catalyst.conf to make it easier to follow while looking at the
+  online reference and added a default catalystrc file, which does nothing.
+
   23 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/catalyst_support.py, modules/embedded_target.py,
   modules/generic_stage_target.py, modules/grp_target.py,

diff --git a/files/catalyst.conf b/files/catalyst.conf
index d95d62471673af824e401c95fc881ab60efccf35..dc53a0c19289caf29e4747edc9ac8c756195634b 100644 (file)
--- a/files/catalyst.conf
+++ b/files/catalyst.conf
@@ -3,10 +3,29 @@
 # Simple desriptions of catalyst settings. Please refer to the online
 # documentation for more information.
 
+# 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"
+
 # distdir specifies where your distfiles are located. This setting should
 # work fine for most default installations.
 distdir="/usr/portage/distfiles"
 
+# envscript allows users to set options such as http proxies, MAKEOPTS,
+# GENTOO_MIRRORS, or any other environment variables needed for building.
+# The envscript file sets environment variables like so:
+# export FOO="bar"
+envscript="/etc/catalyst/catalystrc"
+
+# 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"
+
 # options set different build-time options for catalyst. Some examples are:
 # autoresume = Attempt to resume a failed build, clear the autoresume flags with
 #      the -a option to the catalyst cmdline.  -p will clear the autoresume flags
@@ -28,37 +47,18 @@ distdir="/usr/portage/distfiles"
 # (These options can be used together)
 options="autoresume kerncache pkgcache seedcache snapcache"
 
+# portdir specifies the source portage tree used by the snapshot target.
+portdir="/usr/portage"
+
 # sharedir specifies where all of the catalyst runtime executables are. Most
 # users do not need to change this.
 sharedir="/usr/lib/catalyst"
 
-# storedir specifies where catalyst will store everything that it builds, and
-# also where it will put its temporary files and caches.
-storedir="/var/tmp/catalyst"
-
-# portdir specifies the source portage tree used by the snapshot target.
-# portdir="/usr/portage"
-
 # snapshot_cache specifies where the snapshots will be cached to if snapcache is
 # enabled in the options.
-# snapshot_cache="<path_to_new_cache_dir>"
-
-# 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"
-
-# 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"
+snapshot_cache="/var/tmp/catalyst/snapshot_cache"
 
-# envscript allows users to set options such as http proxies, MAKEOPTS,
-# GENTOO_MIRRORS, or any other environment variables needed for building.
-# The envscript file sets environment variables like so:
-# export FOO="bar"
+# storedir specifies where catalyst will store everything that it builds, and
+# also where it will put its temporary files and caches.
+storedir="/var/tmp/catalyst"
 
-#envscript="/root/.catalystrc"

diff --git a/files/catalystrc b/files/catalystrc
new file mode 100755 (executable)
index 0000000..581772d
--- /dev/null
+++ b/files/catalystrc
@@ -0,0 +1,6 @@
+#!/bin/bash
+# This is an example catalystrc. As such, it doesn't actually *do* anything.
+
+# Uncomment the following to increase the number of threads used to compile.
+# export MAKEOPTS="-j16"
+

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index aae718324906a155d1494b100dce0cc62612769b..7d0cbf9a2291d5a33a371d11a7965cd2be63562b 100644 (file)
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -91,9 +91,10 @@ def calc_hash2(file,cmd,cmd_args,id_string="MD5",verbose=False):
                print header+" (%s) = %s" % (short_file, result)
        return result
 
-#This has map must be defined after the function calc_hash
-#It is possible to call different functions from this but they must be defined before hash_map
-#      Key,function,cmd,cmd_args,Print string
+# This has map must be defined after the function calc_hash
+# It is possible to call different functions from this but they must be defined
+# before hash_map
+# Key,function,cmd,cmd_args,Print string
 hash_map={
         "adler32":[calc_hash2,"shash","-a ADLER32","ADLER32"],\
         "crc32":[calc_hash2,"shash","-a CRC32","CRC32"],\