From 17b1b09dcab9f18776f0b88d366aea58c62c7dcc Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Tue, 13 Dec 2005 19:31:13 +0000 Subject: [PATCH] Move allowable cflags/cxxflags/chost/ldflags changing to stage2 from stage1 where it is allowed git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@963 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- modules/stage1_target.py | 26 +------------------------- modules/stage2_target.py | 26 +++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index b33416bb..6439bad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.450 2005/12/11 20:34:41 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.451 2005/12/13 19:31:13 rocket Exp $ + + 13 Dec 2005; Eric Edgar modules/stage1_target.py, + modules/stage2_target.py: + Move allowable cflags/cxxflags/chost/ldflags changing to stage2 from stage1 + where it is allowed 11 Dec 2005; Eric Edgar modules/generic_stage_target.py, targets/support/bootloader-setup.sh: diff --git a/modules/stage1_target.py b/modules/stage1_target.py index 7fff35a3..cbb58e00 100644 --- a/modules/stage1_target.py +++ b/modules/stage1_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage1_target.py,v 1.16 2005/12/04 17:09:57 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage1_target.py,v 1.17 2005/12/13 19:31:13 rocket Exp $ """ Builder class for a stage1 installation tarball build. @@ -28,30 +28,6 @@ class stage1_target(generic_stage_target): generic_stage_target.set_cleanables(self) self.settings["cleanables"].extend(["/usr/share/gettext","/usr/lib/python2.2/test", "/usr/lib/python2.2/encodings","/usr/lib/python2.2/email", "/usr/lib/python2.2/lib-tk","/usr/share/zoneinfo"]) - def override_chost(self): - if os.environ.has_key("CHOST"): - self.settings["CHOST"] = os.environ["CHOST"] - if self.settings.has_key("chost"): - self.settings["CHOST"]=list_to_string(self.settings["chost"]) - - def override_cflags(self): - if os.environ.has_key("CFLAGS"): - self.settings["CFLAGS"] = os.environ["CFLAGS"] - if self.settings.has_key("cflags"): - self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) - - def override_cxxflags(self): - if os.environ.has_key("CXXFLAGS"): - self.settings["CXXFLAGS"] = os.environ["CXXFLAGS"] - if self.settings.has_key("cxxflags"): - self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) - - def override_ldflags(self): - if os.environ.has_key("LDFLAGS"): - self.settings["LDFLAGS"] = os.environ["LDFLAGS"] - if self.settings.has_key("ldflags"): - self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) - def register(foo): foo.update({"stage1":stage1_target}) return foo diff --git a/modules/stage2_target.py b/modules/stage2_target.py index 6aa60f39..a2d9aa6f 100644 --- a/modules/stage2_target.py +++ b/modules/stage2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage2_target.py,v 1.7 2005/12/02 19:37:02 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage2_target.py,v 1.8 2005/12/13 19:31:13 rocket Exp $ """ Builder class for a stage2 installation tarball build. @@ -32,6 +32,30 @@ class stage2_target(generic_stage_target): if os.path.isfile(self.settings["source_path"]): if os.path.exists(self.settings["source_path"]): self.settings["source_path_md5sum"]=calc_md5(self.settings["source_path"]) + def override_chost(self): + if os.environ.has_key("CHOST"): + self.settings["CHOST"] = os.environ["CHOST"] + if self.settings.has_key("chost"): + self.settings["CHOST"]=list_to_string(self.settings["chost"]) + + def override_cflags(self): + if os.environ.has_key("CFLAGS"): + self.settings["CFLAGS"] = os.environ["CFLAGS"] + if self.settings.has_key("cflags"): + self.settings["CFLAGS"]=list_to_string(self.settings["cflags"]) + + def override_cxxflags(self): + if os.environ.has_key("CXXFLAGS"): + self.settings["CXXFLAGS"] = os.environ["CXXFLAGS"] + if self.settings.has_key("cxxflags"): + self.settings["CXXFLAGS"]=list_to_string(self.settings["cxxflags"]) + + def override_ldflags(self): + if os.environ.has_key("LDFLAGS"): + self.settings["LDFLAGS"] = os.environ["LDFLAGS"] + if self.settings.has_key("ldflags"): + self.settings["LDFLAGS"]=list_to_string(self.settings["ldflags"]) + def register(foo): foo.update({"stage2":stage2_target}) -- 2.26.2