# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.662 2006/10/02 20:25:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.663 2006/10/02 20:32:41 wolf31o2 Exp $
+
+ 02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ modules/generic_stage_target.py:
+ Clean up more spacing/capitalization.
02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> README,
modules/generic_stage_target.py, modules/livecd_stage1_target.py,
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.139 2006/10/02 20:25:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.140 2006/10/02 20:32:41 wolf31o2 Exp $
"""
This class does all of the chroot setup, copying of files, etc. It is
cmd("cp "+self.settings["ENVSCRIPT"]+" "+self.settings["chroot_path"]+"/tmp/envscript",\
"Could not copy envscript into place.",env=self.env)
- # copy over /etc/hosts from the host in case there are any specialties in there
+ # Copy over /etc/hosts from the host in case there are any
+ # specialties in there
if os.path.exists(self.settings["chroot_path"]+"/etc/hosts"):
cmd("mv "+self.settings["chroot_path"]+"/etc/hosts "+self.settings["chroot_path"]+\
"/etc/hosts.bck", "Could not backup /etc/hosts",env=self.env)
#self.override_cflags()
#self.override_cxxflags()
#self.override_ldflags()
- # modify and write out make.conf (for the chroot)
+ # Modify and write out make.conf (for the chroot)
cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.conf","Could not remove "+self.settings["chroot_path"]+"/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 built this stage\n")
- myf.write("# Please consult /etc/make.conf.example for a more detailed example\n")
+ 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('CFLAGS="'+self.settings["CFLAGS"]+'"\n')
myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
if self.settings.has_key("LDFLAGS"):
myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n')
-
- # figure out what our USE vars are for building
+
+ # Figure out what our USE vars are for building
myusevars=[]
if self.settings.has_key("HOSTUSE"):
myusevars.extend(self.settings["HOSTUSE"])
myusevars.extend(self.settings["use"])
myf.write('USE="'+string.join(myusevars)+'"\n')
- # setup the portage overlay
+ # Setup the portage overlay
if self.settings.has_key("portage_overlay"):
myf.write('PORTDIR_OVERLAY="'+string.join(self.settings["portage_overlay"])+'"\n')