Changed example specs to match that cflags/cxxflags/chost/ldflags are now only config...

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

diff --git a/ChangeLog b/ChangeLog
index 875f5a78b4df5f335af73bb13e3d64076fd108c9..6494380567ab3e58d2e2759602a56a9211f38051 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.454 2005/12/13 22:23:23 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.455 2005/12/13 22:52:21 wolf31o2 Exp $
+
+  13 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  examples/generic_stage_template.spec:
+  Changed example specs to match that cflags/cxxflags/chost/ldflags are now
+  only configurable when building a stage2 tarball, to match the current state
+  of portage. This is 2.0_rc9.
 
   13 Dec 2005; Eric Edgar <rocket@gentoo.org>
   targets/support/chroot-functions.sh:

diff --git a/catalyst b/catalyst
index 6493a4dccce4a54f2c3da403f9c69e0aa1b45497..f949e057f1b9b3f5c489833d130a5cc792ddf87f 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.113 2005/12/09 22:38:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.114 2005/12/13 22:52:21 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -10,7 +10,7 @@
 import os,sys,imp,string,getopt
 import pdb
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc8"
+__version__="2.0_rc9"
 
 conf_values={}
 

diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec
index 10b7851d844fd2047a737092921e0ed9e92b1f09..3445791c445e1b78313e9326497e0efec34890aa 100644 (file)
--- a/examples/generic_stage_template.spec
+++ b/examples/generic_stage_template.spec
@@ -59,8 +59,9 @@ distcc_hosts:
 # portage_confdir: /etc/portage
 portage_confdir:
 
-# These options are only available when building a stage1 target and are all
-# optional.
+# These options are only available when building a stage2 target and are all
+# optional.  These allow for emulating the changes possible during a bootstrap.
+# If left blank, then the catalyst defaults from arch.py are used.
 
 # This option is used to change the CHOST from what is default in the profile
 # to whatever you specify.  This is useful for building NPTL, for example.