commit: 298fd82042b6e1afad7f39a9ceb0f623c1c37e6b
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 22 08:39:18 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Jun 15 14:05:53 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=298fd820
rename a make.conf key to make_conf due to bash variable name restrictions
Conflicts:
catalyst/base/stagebase.py
catalyst/defaults.py
---
catalyst/base/stagebase.py | 10 +++++-----
catalyst/defaults.py | 5 ++++-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 6efa98e..99b667a 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1020,7 +1020,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
def chroot_setup(self):
self.makeconf=read_makeconf(normpath(self.settings["chroot_path"]+
- self.settings["make.conf"]))
+ self.settings["make_conf"]))
self.override_cbuild()
self.override_chost()
self.override_cflags()
@@ -1068,7 +1068,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
""" Modify and write out make.conf (for the chroot) """
makepath = normpath(self.settings["chroot_path"] +
- self.settings["make.conf"])
+ self.settings["make_conf"])
cmd("rm -f " + makepath,\
"Could not remove " + makepath, env=self.env)
myf=open(makepath, "w")
@@ -1122,9 +1122,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.close()
makepath = normpath(self.settings["chroot_path"] +
- self.settings["make.conf"])
+ self.settings["make_conf"])
cmd("cp " + makepath + " " + makepath + ".catalyst",\
- "Could not backup " +
self.settings["make.conf"],env=self.env)
+ "Could not backup " +
self.settings["make_conf"],env=self.env)
touch(self.settings["autoresume_path"]+"chroot_setup")
def fsscript(self):
@@ -1172,7 +1172,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
cmd("rm -rf " + self.settings["chroot_path"] +
self.settings["local_overlay"],
"Could not remove " +
self.settings["local_overlay"], env=self.env)
cmd("sed -i '/^PORTDIR_OVERLAY/d'
"+self.settings["chroot_path"]+\
- "/etc/portage/make.conf",\
+ self.settings["make_conf"],\
"Could not remove PORTDIR_OVERLAY from
make.conf",env=self.env)
""" Clean up old and obsoleted files in /etc """
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 2b5eee4..7a9bb23 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -25,7 +25,8 @@ confdefaults={
"hash_function": "crc32",
"icecream": "/var/cache/icecream",
"local_overlay": "/usr/local/portage",
- "options": "",
+ "make_conf": "/etc/portage/make.conf",
+ "options": set(),
"packagedir": "/usr/portage/packages",
"portdir": "/usr/portage",
"port_tmpdir": "/var/tmp/portage",
@@ -42,6 +43,8 @@ PORT_LOGDIR_CLEAN = \
TARGET_MOUNT_DEFAULTS = {
"ccache": "/var/tmp/ccache",
+
+target_mounts = {
"dev": "/dev",
"devpts": "/dev/pts",
"distdir": "/usr/portage/distfiles",
