From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E683D13877A for ; Sun, 15 Jun 2014 14:56:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D742E0D85; Sun, 15 Jun 2014 14:56:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0ED7E0DA5 for ; Sun, 15 Jun 2014 14:56:28 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C3F9B33FF71 for ; Sun, 15 Jun 2014 14:56:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D0354187F4 for ; Sun, 15 Jun 2014 14:56:25 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402841153.298fd82042b6e1afad7f39a9ceb0f623c1c37e6b.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/, catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 298fd82042b6e1afad7f39a9ceb0f623c1c37e6b X-VCS-Branch: pending Date: Sun, 15 Jun 2014 14:56:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 973fb930-5cf2-4828-8d0e-fd77016e43bb X-Archives-Hash: 33c8219a5749c37346819134c61d6a1f commit: 298fd82042b6e1afad7f39a9ceb0f623c1c37e6b Author: Brian Dolbec gentoo org> AuthorDate: Tue Jan 22 08:39:18 2013 +0000 Commit: Brian Dolbec gmail 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",