public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Brian Dolbec <dolsen@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 6/6] Set mountmap["icecream"] from settings for now.
Date: Sun, 29 Dec 2013 17:50:53 -0800	[thread overview]
Message-ID: <1388368253-22018-7-git-send-email-dolsen@gentoo.org> (raw)
In-Reply-To: <1388368253-22018-1-git-send-email-dolsen@gentoo.org>

“mountmap” is for source paths.  “mounts” is for path-agnostic keys.
I plan to add a source_mounts to settings later to compliment the target_mounts paths.
---
 catalyst                        | 1 +
 modules/generic_stage_target.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/catalyst b/catalyst
index 82b0942..cb6c022 100755
--- a/catalyst
+++ b/catalyst
@@ -66,6 +66,7 @@ def parse_config(myconfig):
 	confdefaults = {
 		"distdir": "/usr/portage/distfiles",
 		"hash_function": "crc32",
+		"icecream": "/var/cache/icecream",
 		"local_overlay": "/usr/local/portage",
 		"options": "",
 		"packagedir": "/usr/portage/packages",
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 8d98e58..bbea57a 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -249,8 +249,8 @@ class generic_stage_target(generic_target):
 			self.env["CCACHE_DIR"] = self.target_mounts["ccache"]
 
 		if "ICECREAM" in self.settings:
-			self.mounts.append("/var/cache/icecream")
-			self.mountmap["/var/cache/icecream"]="/var/cache/icecream"
+			self.mounts.append("icecream")
+			self.mountmap["icecream"] = self.settings["icecream"]
 			self.env["PATH"] = self.target_mounts["icecream"] + ":" + \
 				self.env["PATH"]
 
-- 
1.8.3.2



  parent reply	other threads:[~2013-12-30  1:52 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-29  1:57 [gentoo-catalyst] Patches to fix rebased patches already applied to current master Brian Dolbec
2013-12-29  1:57 ` [gentoo-catalyst] [PATCH 1/6] modules/generic_stage_target.py: USE portdir, distdir,... instead of paths for keys Brian Dolbec
2013-12-29  2:16   ` W. Trevor King
2013-12-29  1:57 ` [gentoo-catalyst] [PATCH 2/6] Fix a missed self.settings["repo_name"] migration Brian Dolbec
2013-12-29  2:19   ` W. Trevor King
2013-12-29  5:08     ` Brian Dolbec
2013-12-29  1:57 ` [gentoo-catalyst] [PATCH 3/6] Add "local_overlay" to configdefaults Brian Dolbec
2013-12-29  2:24   ` W. Trevor King
2013-12-29  1:57 ` [gentoo-catalyst] [PATCH 4/6] Fix a missed self.mounts key change from a path as key Brian Dolbec
2013-12-29  2:30   ` W. Trevor King
2013-12-29  1:57 ` [gentoo-catalyst] [PATCH 5/6] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Brian Dolbec
2013-12-29  2:49   ` W. Trevor King
2013-12-29  3:52     ` W. Trevor King
2013-12-29  4:58       ` Brian Dolbec
2013-12-31  2:54       ` [gentoo-catalyst] mounts changes was: " Brian Dolbec
2013-12-31  3:06         ` [gentoo-catalyst] Re: mounts changes W. Trevor King
2014-01-01  6:05         ` [gentoo-catalyst] mounts changes was: [PATCH 5/6] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Jorge Manuel B. S. Vicetto
2014-01-01 18:53           ` W. Trevor King
2014-01-02  2:50             ` Jorge Manuel B. S. Vicetto
2013-12-29  5:02     ` [gentoo-catalyst] " Brian Dolbec
2013-12-29  5:26   ` Alec Warner
2013-12-29  6:01     ` Brian Dolbec
2013-12-29  1:57 ` [gentoo-catalyst] [PATCH 6/6] Set mountmap["icecream"] from settings for now Brian Dolbec
2013-12-29  2:53   ` W. Trevor King
2013-12-29  3:00     ` W. Trevor King
2013-12-30  1:50 ` [gentoo-catalyst] Patches to fix rebased patches already applied to current master. Version-2 Brian Dolbec
2013-12-30  1:50   ` [gentoo-catalyst] [PATCH 1/6] modules/generic_stage_target.py: Use portdir, distdir,... instead of paths for keys Brian Dolbec
2013-12-30  3:54     ` W. Trevor King
2013-12-30  1:50   ` [gentoo-catalyst] [PATCH 2/6] Fix a missed self.settings["repo_name"] migration Brian Dolbec
2013-12-30  3:58     ` W. Trevor King
2013-12-30  1:50   ` [gentoo-catalyst] [PATCH 3/6] Fixes commit 463d98f (modules/generic_stage_target.py: Use a 'local_overlay' setting instead of hard-coding '/usr/local/portage', 2012-12-19).Add "local_overlay" to configdefaults Brian Dolbec
2013-12-30  4:02     ` W. Trevor King
2013-12-30  5:32       ` Brian Dolbec
2013-12-30  6:35         ` W. Trevor King
2013-12-30  6:48           ` Brian Dolbec
2013-12-30  1:50   ` [gentoo-catalyst] [PATCH 4/6] Fix mounts and mountmap port_logdir code block Brian Dolbec
2013-12-30  4:09     ` W. Trevor King
2013-12-30  5:46       ` Brian Dolbec
2013-12-30  1:50   ` [gentoo-catalyst] [PATCH 5/6] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Brian Dolbec
2013-12-30  4:16     ` W. Trevor King
2013-12-30  1:50   ` Brian Dolbec [this message]
2013-12-30  4:19     ` [gentoo-catalyst] [PATCH 6/6] Set mountmap["icecream"] from settings for now W. Trevor King
2013-12-30  3:33   ` [gentoo-catalyst] Patches to fix rebased patches already applied to current master. Version-2 W. Trevor King
2014-01-03  4:16 ` [PATCH v3 0/6] "Re: " Brian Dolbec
2014-01-03  4:16   ` [gentoo-catalyst] [PATCH v3 1/6] modules/generic_stage_target.py: Use portdir, distdir, ... instead of paths for keys Brian Dolbec
2014-01-03  4:30     ` [gentoo-catalyst] " W. Trevor King
2014-01-03  4:16   ` [gentoo-catalyst] [PATCH v3 2/6] Fix a missed self.settings["repo_name"] migration Brian Dolbec
2014-01-03  4:33     ` W. Trevor King
2014-01-03  4:53     ` [gentoo-catalyst] [PATCH v4 1/1] " Brian Dolbec
2014-01-03  5:02     ` Brian Dolbec
2014-01-03  5:09     ` [gentoo-catalyst] [PATCH v5 " Brian Dolbec
2014-01-03  4:16   ` [gentoo-catalyst] [PATCH v3 3/6] Add "local_overlay" to configdefaults Brian Dolbec
2014-01-03  4:36     ` W. Trevor King
2014-01-03  4:16   ` [gentoo-catalyst] [PATCH v3 4/6] Fix mounts and mountmap port_logdir code block Brian Dolbec
2014-01-03  4:40     ` W. Trevor King
2014-01-03  4:16   ` [gentoo-catalyst] [PATCH v3 5/6] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary Brian Dolbec
2014-01-03  4:47     ` W. Trevor King
2014-01-03  6:08     ` W. Trevor King
2014-01-03  6:55       ` Brian Dolbec
2014-01-03  4:16   ` [gentoo-catalyst] [PATCH v3 6/6] Set mountmap["icecream"] from settings for now Brian Dolbec
2014-01-03  4:48     ` W. Trevor King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1388368253-22018-7-git-send-email-dolsen@gentoo.org \
    --to=dolsen@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox