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

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

[Sebastian Pipping]

commit:     415b30bf2d3410341ee93914c90d21b2bfcf4068
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  2 14:48:44 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 14:48:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=415b30bf

Replace content on master with content from catalyst_2

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Sebastian Pipping]

commit:     415b30bf2d3410341ee93914c90d21b2bfcf4068
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Mon Jul  2 14:48:44 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 14:48:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=415b30bf

Replace content on master with content from catalyst_2

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Sebastian Pipping]

commit:     9cdcc0b58f0c4dae36d268ed2af4d184cedc1808
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Jul 10 18:31:47 2012 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 18:31:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9cdcc0b5

Merge branch 'catalyst-spec-man-page' into catalyst_2


 Makefile                        |   18 +-
 doc/.gitignore                  |    2 +
 doc/catalyst-spec.5.txt         |  508 +++++++++++++++++++++++++++++++++++++++
 doc/catalyst.1.txt              |   16 +-
 doc/make_target_table.py        |   42 ++++
 files/.gitignore                |    2 +
 modules/embedded_target.py      |   19 +-
 modules/generic_stage_target.py |   11 +-
 modules/generic_target.py       |    9 +-
 modules/grp_target.py           |    7 +-
 modules/livecd_stage1_target.py |    7 +-
 modules/livecd_stage2_target.py |    7 +-
 modules/netboot2_target.py      |    7 +-
 modules/netboot_target.py       |    7 +-
 modules/snapshot_target.py      |    6 +-
 modules/stage1_target.py        |    7 +-
 modules/stage2_target.py        |    7 +-
 modules/stage3_target.py        |    7 +-
 modules/stage4_target.py        |    7 +-
 modules/tinderbox_target.py     |    7 +-
 20 files changed, 649 insertions(+), 54 deletions(-)

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Sebastian Pipping]

commit:     453a550bacf07fc9c63fb18be812e0c2b858571d
Author:     Andrew Gaffney <agaffney <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 01:51:44 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 01:51:44 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=453a550b

Merge branch 'master' into merge_tmp

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Sebastian Pipping]

commit:     91db7ea374321ec542a1e1e7924e9aebe829b5ca
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 29 00:07:16 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jun 29 00:07:16 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=91db7ea3

Merge branch 'catalyst_3' of git+ssh://git <AT> linbsd.net/projs/catalyst into catalyst_3


 ChangeLog               |    6 +++++-
 files/livecd/README.txt |    9 +++++++++
 files/livecd/x86-F6.msg |    9 +++++++++
 3 files changed, 23 insertions(+), 1 deletions(-)

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Jorge Manuel B. S. Vicetto]

commit:     672a8b80225e5e32d6e8d6ddfbc5e4ad13264a9b
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun May 13 18:04:34 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun May 13 18:04:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=672a8b80

Release 2.0.9

---
 catalyst |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/catalyst b/catalyst
index 70631ab..9da14c0 100755
--- a/catalyst
+++ b/catalyst
@@ -3,6 +3,7 @@
 # Maintained in full by:
 # Andrew Gaffney <agaffney@gentoo.org>
 # Chris Gianelloni <wolf31o2@wolf31o2.org>
+# Release Engineering Team <releng@gentoo.org>
 # $Id$
 
 import os, sys, imp, string, getopt
@@ -16,8 +17,8 @@ sys.path.append(__selfpath__ + "/modules")
 import catalyst.config
 import catalyst.util
 
-__maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.8.1"
+__maintainer__="Chris Gianelloni <releng@gentoo.org>"
+__version__="2.0.9"
 
 conf_values={}
 

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Raúl Porcel]

commit:     7a6a4102ca67d16e307ad8ae92fd6db250335da3
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 20:14:29 2012 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Fri May 11 20:14:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7a6a4102

Release 2.0.8.1

---
 catalyst |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/catalyst b/catalyst
index 8f23cbd..70631ab 100755
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.8"
+__version__="2.0.8.1"
 
 conf_values={}
 

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Jorge Manuel B. S. Vicetto]

commit:     4d90f71e256ef31eb8fa1649e219eb519ce16496
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 02:43:45 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 02:43:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4d90f71e

Update version to do a 2.0.8 release.

---
 catalyst |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/catalyst b/catalyst
index 6b6ba2d..8f23cbd 100755
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.7.1"
+__version__="2.0.8"
 
 conf_values={}
 

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Jorge Manuel B. S. Vicetto]

commit:     b83092d2b26ba189cce7c3295bae48be34289914
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 19:39:57 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 19:39:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b83092d2

Update version to do a 2.0.7.1 release.

---
 catalyst |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/catalyst b/catalyst
index 9710837..f05a7bc 100755
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.7"
+__version__="2.0.7.1"
 
 conf_values={}
 

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Jorge Manuel B. S. Vicetto]

commit:     75f8eb9660109f1e6097b1e9f5dad8784ecc21e8
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 19:36:21 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 19:36:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=75f8eb96

Update version to do a 2.0.7 release.

---
 catalyst |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/catalyst b/catalyst
index 8aa4f9d..9710837 100755
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.6.918"
+__version__="2.0.7"
 
 conf_values={}
 

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Jorge Manuel B. S. Vicetto]

commit:     d3ae8f14aee7fd7f03c682445dd592228acfcdce
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 02:16:30 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 02:16:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d3ae8f14

Bumped version - there won't be a 2.0.6.917 release as I failed to update the version before tagging.

---
 catalyst |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/catalyst b/catalyst
index b4e0c37..8aa4f9d 100755
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.6.916"
+__version__="2.0.6.918"
 
 conf_values={}
 

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Sebastian Pipping]

commit:     69249638aaf3e3099303869b9a326106bc8782ad
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 25 18:07:08 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 18:10:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=69249638

Makefile: Add missing dependency

Conflicts:

	Makefile

---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 83fbd5a..30a0411 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ files/catalyst.1: doc/catalyst.1.txt doc/subarches.generated.txt doc/asciidoc.co
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \
 		 --format=manpage -D files "$<"
 
-doc/subarches.generated.txt: $(wildcard arch/*.py)
+doc/subarches.generated.txt: $(wildcard arch/*.py) doc/make_subarch_table_guidexml.py
 	./doc/make_subarch_table_guidexml.py
 
 clean:

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Sebastian Pipping]

commit:     ac68b238776b5fb38d3eae4e66397c4e751d594d
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Jun 25 15:36:53 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 15:36:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ac68b238

Makefile: Improve dependencies

---
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index bcc40c7..83fbd5a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,19 +2,19 @@
 # Licensed under GPL v2 or later
 
 PACKAGE_VERSION = `fgrep '__version__=' catalyst | sed 's|^__version__="\(.*\)"$$|\1|'`
-CLEAN_FILES = files/catalyst.1 doc/subarches.generated.txt
 EXTRA_DIST = files/catalyst.1
+CLEAN_FILES = $(EXTRA_DIST) doc/subarches.generated.txt
 
 distdir = catalyst-$(PACKAGE_VERSION)
 
 
-all: files/catalyst.1
+all: $(EXTRA_DIST)
 
 files/catalyst.1: doc/catalyst.1.txt doc/subarches.generated.txt doc/asciidoc.conf Makefile catalyst
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \
 		 --format=manpage -D files "$<"
 
-doc/subarches.generated.txt:
+doc/subarches.generated.txt: $(wildcard arch/*.py)
 	./doc/make_subarch_table_guidexml.py
 
 clean:

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Sebastian Pipping]

commit:     be47548df7105e0f656effe708f7d2e803c99aea
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Thu Jun 23 21:45:46 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 21:45:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=be47548d

There is no dict conf_values.settings, replace by plain conf_values

---
 catalyst |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalyst b/catalyst
index efcaa15..b4e0c37 100755
--- a/catalyst
+++ b/catalyst
@@ -179,7 +179,7 @@ def import_modules():
 
 			except IOError:
 				raise CatalystError,"Can't find "+x+".py plugin in "+\
-					conf_values.settings["sharedir"]+"/modules/"
+					conf_values["sharedir"]+"/modules/"
 
 		for x in valid_build_targets:
 			try:
@@ -190,7 +190,7 @@ def import_modules():
 
 			except IOError:
 				raise CatalystError,"Can't find "+x+".py plugin in "+\
-					conf_values.settings["sharedir"]+"/modules/"
+					conf_values["sharedir"]+"/modules/"
 
 	except ImportError:
 		print "!!! catalyst: Python modules not found in "+\

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Raúl Porcel]

commit:     136efe43102bc3be700476c3230671f6b9a87664
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 10:20:39 2011 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 10:20:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=136efe43

This is catalyst 2.0.6.916

---
 ChangeLog |    3 +++
 catalyst  |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4942896..68ef5be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  14 Apr 2011; Raúl Porcel <armin76@gentoo.org> catalyst:
+  This is catalyst 2.0.6.916
+
   14 Apr 2011; Raúl Porcel <armin76@gentoo.org>
   targets/support/bootloader-setup.sh:
   Add gentoo-ilo option for the bootloader on ia64

diff --git a/catalyst b/catalyst
index fdf8570..efcaa15 100755
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.6.915"
+__version__="2.0.6.916"
 
 conf_values={}
 

[gentoo-commits] proj/catalyst:catalyst_2 commit in: /

[Raúl Porcel]

commit:     ba00c197cd0767f227bff3af7fe03317dffe07f5
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 18:27:19 2011 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 18:27:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ba00c197

This is catalyst 2.0.6.914

---
 ChangeLog |    3 +++
 catalyst  |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5278085..791f0e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  05 Feb 2011; Raúl Porcel <armin76@gentoo.org> catalyst:
+  This is catalyst 2.0.6.914
+
   05 Feb 2011; Raúl Porcel <armin76@gentoo.org> arch/amd64.py, catalyst:
   Enable new amd64 subarches
 

diff --git a/catalyst b/catalyst
index e5e043a..b8fd848 100755
--- a/catalyst
+++ b/catalyst
@@ -17,7 +17,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.6.913"
+__version__="2.0.6.914"
 
 conf_values={}