| 1 |
commit: 389c0059ad1d6fdb6e06a4f79d07843bb062aaac |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 22 08:39:18 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Sep 2 02:13:44 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=389c0059 |
| 7 |
|
| 8 |
rename a make.conf key to make_conf due to bash variable name restrictions |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
catalyst/base/stagebase.py |
| 12 |
catalyst/defaults.py |
| 13 |
|
| 14 |
--- |
| 15 |
catalyst/base/stagebase.py | 10 +++++----- |
| 16 |
catalyst/defaults.py | 3 ++- |
| 17 |
2 files changed, 7 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 20 |
index cb1929a..5f85a73 100644 |
| 21 |
--- a/catalyst/base/stagebase.py |
| 22 |
+++ b/catalyst/base/stagebase.py |
| 23 |
@@ -1020,7 +1020,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 24 |
|
| 25 |
def chroot_setup(self): |
| 26 |
self.makeconf=read_makeconf(normpath(self.settings["chroot_path"]+ |
| 27 |
- self.settings["make.conf"])) |
| 28 |
+ self.settings["make_conf"])) |
| 29 |
self.override_cbuild() |
| 30 |
self.override_chost() |
| 31 |
self.override_cflags() |
| 32 |
@@ -1068,7 +1068,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 33 |
|
| 34 |
""" Modify and write out make.conf (for the chroot) """ |
| 35 |
makepath = normpath(self.settings["chroot_path"] + |
| 36 |
- self.settings["make.conf"]) |
| 37 |
+ self.settings["make_conf"]) |
| 38 |
cmd("rm -f " + makepath,\ |
| 39 |
"Could not remove " + makepath, env=self.env) |
| 40 |
myf=open(makepath, "w") |
| 41 |
@@ -1122,9 +1122,9 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 42 |
|
| 43 |
myf.close() |
| 44 |
makepath = normpath(self.settings["chroot_path"] + |
| 45 |
- self.settings["make.conf"]) |
| 46 |
+ self.settings["make_conf"]) |
| 47 |
cmd("cp " + makepath + " " + makepath + ".catalyst",\ |
| 48 |
- "Could not backup " + self.settings["make.conf"],env=self.env) |
| 49 |
+ "Could not backup " + self.settings["make_conf"],env=self.env) |
| 50 |
touch(self.settings["autoresume_path"]+"chroot_setup") |
| 51 |
|
| 52 |
def fsscript(self): |
| 53 |
@@ -1172,7 +1172,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 54 |
cmd("rm -rf " + self.settings["chroot_path"] + self.settings["local_overlay"], |
| 55 |
"Could not remove " + self.settings["local_overlay"], env=self.env) |
| 56 |
cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\ |
| 57 |
- "/etc/portage/make.conf",\ |
| 58 |
+ self.settings["make_conf"],\ |
| 59 |
"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env) |
| 60 |
|
| 61 |
""" Clean up old and obsoleted files in /etc """ |
| 62 |
|
| 63 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 64 |
index 2b5eee4..4d405ba 100644 |
| 65 |
--- a/catalyst/defaults.py |
| 66 |
+++ b/catalyst/defaults.py |
| 67 |
@@ -25,7 +25,8 @@ confdefaults={ |
| 68 |
"hash_function": "crc32", |
| 69 |
"icecream": "/var/cache/icecream", |
| 70 |
"local_overlay": "/usr/local/portage", |
| 71 |
- "options": "", |
| 72 |
+ "make_conf": "/etc/portage/make.conf", |
| 73 |
+ "options": set(), |
| 74 |
"packagedir": "/usr/portage/packages", |
| 75 |
"portdir": "/usr/portage", |
| 76 |
"port_tmpdir": "/var/tmp/portage", |
Archives