[gentoo-commits] proj/catalyst:master commit in: /, modules/

[gentoo-commits] proj/catalyst:master commit in: /, modules/

[Matt Turner]

commit:     c3314705e9ff3cf20ce6da3ffd5e56e989fdc695
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 07:17:22 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 04:17:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c3314705

catalyst: Add 'repo_name' default

W. Trevor King: Refactored Git history for Brian Dolbec's content changes.

Reviewed-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: W. Trevor King <wking <AT> tremily.us>
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

---
 catalyst                   | 1 +
 modules/snapshot_target.py | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/catalyst b/catalyst
index e229133..0fc65b0 100755
--- a/catalyst
+++ b/catalyst
@@ -66,6 +66,7 @@ def parse_config(myconfig):
 		"hash_function": "crc32",
 		"options": "",
 		"portdir": "/usr/portage",
+		"repo_name": "portage",
 		"sharedir": "/usr/share/catalyst",
 		"snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
 		"storedir": "/var/tmp/catalyst",

diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py
index e93a86a..02b9831 100644
--- a/modules/snapshot_target.py
+++ b/modules/snapshot_target.py
@@ -46,11 +46,14 @@ class snapshot_target(generic_stage_target):
 		if not os.path.exists(mytmp):
 			os.makedirs(mytmp)
 
-		cmd("rsync -a --delete --exclude /packages/ --exclude /distfiles/ --exclude /local/ --exclude CVS/ --exclude .svn --filter=H_**/files/digest-* "+\
-			self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env)
+		cmd("rsync -a --delete --exclude /packages/ --exclude /distfiles/ " +
+			"--exclude /local/ --exclude CVS/ --exclude .svn --filter=H_**/files/digest-* " +
+			self.settings["portdir"] + "/ " + mytmp + "/%s/" % self.settings["repo_name"],
+			"Snapshot failure", env=self.env)
 
 		print "Compressing Portage snapshot tarball..."
-		cmd("tar -I lbzip2 -cf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\
+		cmd("tar -I lbzip2 -cf " + self.settings["snapshot_path"] + " -C " +
+			mytmp + " " + self.settings["repo_name"],
 			"Snapshot creation failure",env=self.env)
 
 		self.gen_contents_file(self.settings["snapshot_path"])

[gentoo-commits] proj/catalyst:master commit in: /, modules/

[Matt Turner]

commit:     45ba1cd6d21d34f55f9f13697dc4cb859487285c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 02:56:04 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 04:17:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=45ba1cd6

catalyst: Add 'packagedir' default instead of hard-coding '/usr/portage/packages'

W. Trevor King: Refactored Git history for Brian Dolbec's content changes.

Reviewed-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: W. Trevor King <wking <AT> tremily.us>
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

---
 catalyst                        | 1 +
 modules/generic_stage_target.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalyst b/catalyst
index 131529a..c62b745 100755
--- a/catalyst
+++ b/catalyst
@@ -65,6 +65,7 @@ def parse_config(myconfig):
 		"distdir": "/usr/portage/distfiles",
 		"hash_function": "crc32",
 		"options": "",
+		"packagedir": "/usr/portage/packages",
 		"portdir": "/usr/portage",
 		"repo_name": "portage",
 		"sharedir": "/usr/share/catalyst",

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 63661fe..c890773 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1068,7 +1068,7 @@ class generic_stage_target(generic_target):
 
 			myf.write('PORTDIR="%s"\n' % self.settings['portdir'])
 			myf.write('DISTDIR="%s"\n' % self.settings['distdir'])
-			myf.write('PKGDIR="${PORTDIR}/packages"\n')
+			myf.write('PKGDIR="%s"\n' % self.settings['packagedir'])
 
 			""" Setup the portage overlay """
 			if "portage_overlay" in self.settings:

[gentoo-commits] proj/catalyst:master commit in: /, modules/

[Matt Turner]

commit:     26f8ce4eefd9c0e6d3858480b4d97df4f62a7454
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 07:17:22 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 04:17:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=26f8ce4e

catalyst: Add 'snapshot_name' default

W. Trevor King: Refactored Git history for Brian Dolbec's content changes.

Reviewed-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: W. Trevor King <wking <AT> tremily.us>
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

---
 catalyst                        | 1 +
 modules/generic_stage_target.py | 6 ++++--
 modules/snapshot_target.py      | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/catalyst b/catalyst
index 0fc65b0..131529a 100755
--- a/catalyst
+++ b/catalyst
@@ -68,6 +68,7 @@ def parse_config(myconfig):
 		"portdir": "/usr/portage",
 		"repo_name": "portage",
 		"sharedir": "/usr/share/catalyst",
+		"snapshot_name": "portage-",
 		"snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
 		"storedir": "/var/tmp/catalyst",
 		}

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 6ee35d2..63661fe 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -410,7 +410,8 @@ class generic_stage_target(generic_target):
 
 	def set_snapshot_path(self):
 		self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
-			"/snapshots/portage-"+self.settings["snapshot"]+".tar.xz")
+			"/snapshots/" + self.settings["snapshot_name"] +
+			self.settings["snapshot"] + ".tar.xz")
 
 		if os.path.exists(self.settings["snapshot_path"]):
 			self.settings["snapshot_path_hash"]=\
@@ -418,7 +419,8 @@ class generic_stage_target(generic_target):
 				hash_function=self.settings["hash_function"],verbose=False)
 		else:
 			self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
-				"/snapshots/portage-"+self.settings["snapshot"]+".tar.bz2")
+				"/snapshots/" + self.settings["snapshot_name"] +
+				self.settings["snapshot"] + ".tar.bz2")
 
 			if os.path.exists(self.settings["snapshot_path"]):
 				self.settings["snapshot_path_hash"]=\

diff --git a/modules/snapshot_target.py b/modules/snapshot_target.py
index 02b9831..ba1bab5 100644
--- a/modules/snapshot_target.py
+++ b/modules/snapshot_target.py
@@ -18,8 +18,9 @@ class snapshot_target(generic_stage_target):
 		self.settings=myspec
 		self.settings["target_subpath"]="portage"
 		st=self.settings["storedir"]
-		self.settings["snapshot_path"]=normpath(st+"/snapshots/portage-"+self.settings["version_stamp"]\
-			+".tar.bz2")
+		self.settings["snapshot_path"] = normpath(st + "/snapshots/"
+			+ self.settings["snapshot_name"]
+			+ self.settings["version_stamp"] + ".tar.bz2")
 		self.settings["tmp_path"]=normpath(st+"/tmp/"+self.settings["target_subpath"])
 
 	def setup(self):

[gentoo-commits] proj/catalyst:pending commit in: /, modules/

[Brian Dolbec]

commit:     75f383147ce74c5de6e09d80a8ae43f982fc24c4
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 00:07:15 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 04:39:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=75f38314

Set mountmap["icecream"] from settings for now.

“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 63a8ff5..7919f07 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -250,8 +250,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"]
 

[gentoo-commits] proj/catalyst:master commit in: /, modules/

[Brian Dolbec]

commit:     75f383147ce74c5de6e09d80a8ae43f982fc24c4
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 00:07:15 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 04:39:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=75f38314

Set mountmap["icecream"] from settings for now.

“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 63a8ff5..7919f07 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -250,8 +250,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"]