From 5916beb2654d4bd3b7a48732b92879723d758200 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 30 Jan 2007 19:53:13 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1210 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 ++++ files/catalyst.conf | 52 ++++++++++++++++++------------------- files/catalystrc | 6 +++++ modules/catalyst_support.py | 7 ++--- 4 files changed, 41 insertions(+), 29 deletions(-) create mode 100755 files/catalystrc diff --git a/ChangeLog b/ChangeLog index d06bd326..9caaad40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 30 Jan 2007; Chris Gianelloni 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 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 d95d6247..dc53a0c1 100644 --- 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="" - -# 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 index 00000000..581772df --- /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 aae71832..7d0cbf9a 100644 --- 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"],\ -- 2.26.2