From: Andrew Gaffney Date: Wed, 21 Jan 2009 03:39:06 +0000 (-0600) Subject: Update reference to make.conf.example for new location in portage-2.1.6 X-Git-Tag: CATALYST_2_0_6_916~39 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b0fcbd7e2b947b6107c366776a6626d4b4a98405;p=catalyst.git Update reference to make.conf.example for new location in portage-2.1.6 --- diff --git a/ChangeLog b/ChangeLog index 76836c62..af61f542 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 21 Jan 2009; Andrew Gaffney + modules/generic_stage_target.py: + Update reference to make.conf.example for new location in portage-2.1.6 + 20 Jan 2009; Andrew Gaffney targets/stage1/stage1-chroot.sh: Remove --noreplace from run_merge call so that baselayout gets rebuilt diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index f6c55d5e..92ec3817 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1001,7 +1001,7 @@ class generic_stage_target(generic_target): "/etc/make.conf",env=self.env) myf=open(self.settings["chroot_path"]+"/etc/make.conf","w") myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n") - myf.write("# Please consult /etc/make.conf.example for a more detailed example.\n") + myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n") if self.settings.has_key("CFLAGS"): myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n') if self.settings.has_key("CXXFLAGS"):