From e8b17c9093a3591a4f1ab3c9098ad12f5890a43e Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 13 Dec 2005 22:52:21 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@967 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- catalyst | 4 ++-- examples/generic_stage_template.spec | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 875f5a78..64943805 100644 --- 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 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 targets/support/chroot-functions.sh: diff --git a/catalyst b/catalyst index 6493a4dc..f949e057 100755 --- 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 @@ -10,7 +10,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 10b7851d..3445791c 100644 --- 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. -- 2.26.2