Retired zhen and added storedir to default catalyst.conf.

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

diff --git a/AUTHORS b/AUTHORS
index b58bf3a4a3a8838a8cb7036e3d30469b2ab258ef..9fc5f80cb2ee12b71dfa96748a54b41b48b09ee7 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,8 +8,7 @@ Daniel Robbins <drobbins@gentoo.org>
 
 Contributors:
 Rob Holland <tigger@gentoo.org>
-Chris Gianelloni <wolf31o2@gentoo.org>
 Guy Martin <gmsoft@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
-Eric Edgar <rocket@gentoo.org>
 Gustavo Zacarias <gustavoz@gentoo.org>
+Robert Paskowitz <r2d2@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index 90d5d233d13cd5b73be261b2fe266d48b237f305..5c71a09325cb35bbf605710efa5964b64ee84764 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.261 2005/05/20 17:12:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.262 2005/05/20 19:16:47 wolf31o2 Exp $
+
+  20 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, catalyst,
+  files/catalyst.conf:
+  Retired zhen and added storedir to default catalyst.conf.
 
   20 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/catalyst b/catalyst
index fee23d9e85f68bc59f364d2cc10f79d19f02b065..0cc629a2c14b1dffb81b5211fcd341d075f0f73d 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,12 +1,11 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.82 2005/05/18 18:09:14 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.83 2005/05/20 19:16:47 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
 # Chris Gianelloni <wolf31o2@gentoo.org>
-# John Davis <zhen@gentoo.org>
 
 import os,sys,imp,string,getopt
 

diff --git a/files/catalyst.conf b/files/catalyst.conf
index 1abe4eb497a6f999e17123efa7638307161d7ff3..8ce6d2124965e2026a6c3316b1bf32f24ac543a8 100644 (file)
--- a/files/catalyst.conf
+++ b/files/catalyst.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.9 2005/02/04 16:55:59 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.10 2005/05/20 19:16:47 wolf31o2 Exp $
 
 # Simple desriptions of catalyst settings. Please refer to the online
 # documentation for more information.
@@ -19,12 +19,16 @@ distdir="/usr/portage/distfiles"
 #      build stops in livecd-stage2)
 options="pkgcache kerncache"
 
-# sharedir specifies where all of the catalyst runtime executables are. Most users do
-# not need to change this.
+# sharedir specifies where all of the catalyst runtime executables are. Most
+# users do not need to change this.
 sharedir="/usr/lib/catalyst"
 
-# envscript allows users to set options such as http proxies, MAKEOPTS, GENTOO_MIRRORS,
-# or any other environment variables needed for building.
+# 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 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"