From 91c458739d19864aaa89915d44ddcf033c42c98d Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Tue, 20 Jan 2009 21:36:21 -0600 Subject: [PATCH] Update reference to make.conf.example for new location in portage-2.1.6 --- ChangeLog | 4 ++++ modules/catalyst/target/generic_stage.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3f06ed45..91659cde 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/catalyst/target/generic_stage.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/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py index 43902ee3..df5c9375 100644 --- a/modules/catalyst/target/generic_stage.py +++ b/modules/catalyst/target/generic_stage.py @@ -877,7 +877,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 "CFLAGS" in self.settings: myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n') if "CXXFLAGS" in self.settings: -- 2.26.2