Brian Dolbec | 11 Sep 06:01 2014
Picon

[PATCH 0/6] Various changes towards 3.0 branch

Another convienence grouping of various patches.  
This is the last 6 patches remaining in the pending branch at this time.
Once these 3 patch series are caught up, I'll move more from 3.0 into pending.

Brian Dolbec (6):
  FIXME! Comment out a small code block causing TypeError.
  Break out more repeated (path1 + path2)'s...
  Rename a make.conf key to make_conf due to bash variable name
    restrictions
  reduce 2 operations into one simpler one
  Extend ParserBase to do variable substitution.
  Make shdir a complete path to ease it's use.

 catalyst/base/stagebase.py                        | 45 ++++++++++++-----------
 catalyst/config.py                                |  9 ++---
 catalyst/defaults.py                              |  4 +-
 catalyst/lock.py                                  | 23 +++++++++---
 catalyst/main.py                                  |  6 ++-
 etc/catalyst.conf                                 |  8 +++-
 targets/embedded/embedded-controller.sh           | 22 +++++------
 targets/grp/grp-controller.sh                     |  6 +--
 targets/livecd-stage1/livecd-stage1-controller.sh |  4 +-
 targets/livecd-stage2/livecd-stage2-controller.sh | 22 +++++------
 targets/netboot/netboot-combine.sh                |  6 +--
 targets/netboot/netboot-controller.sh             | 24 ++++++------
 targets/netboot2/netboot2-controller.sh           | 16 ++++----
 targets/stage1/stage1-controller.sh               |  8 ++--
 targets/stage2/stage2-controller.sh               |  6 +--
 targets/stage3/stage3-controller.sh               |  6 +--
 targets/stage4/stage4-controller.sh               | 22 +++++------
(Continue reading)

Brian Dolbec | 11 Sep 05:50 2014
Picon

[PATCH 0/3] Code breakup & restructuring

This is a group of 3 patches that all need to be applied for catalyst to run.
commit messages pretty much describe what they change.

Brian Dolbec (3):
  [1 of 3] Move base stage and target files to thier own sub-pkg
  [2 of 3] Update module loading for the new python structure
  [3 of 3] Rename all target .py files and classes without _target in
    them.

 catalyst/base/__init__.py                |    1 +
 catalyst/base/clearbase.py               |  115 +++
 catalyst/base/genbase.py                 |   58 ++
 catalyst/base/stagebase.py               | 1630 ++++++++++++++++++++++++++++++
 catalyst/base/targetbase.py              |   15 +
 catalyst/main.py                         |   75 +-
 catalyst/targets/clearbase.py            |  115 ---
 catalyst/targets/embedded.py             |   47 +
 catalyst/targets/embedded_target.py      |   51 -
 catalyst/targets/genbase.py              |   58 --
 catalyst/targets/generic_stage_target.py | 1630 ------------------------------
 catalyst/targets/grp.py                  |  120 +++
 catalyst/targets/grp_target.py           |  118 ---
 catalyst/targets/livecd_stage1.py        |   78 ++
 catalyst/targets/livecd_stage1_target.py |   75 --
 catalyst/targets/livecd_stage2.py        |  147 +++
 catalyst/targets/livecd_stage2_target.py |  148 ---
 catalyst/targets/netboot.py              |  129 +++
 catalyst/targets/netboot2.py             |  169 ++++
 catalyst/targets/netboot2_target.py      |  166 ---
 catalyst/targets/netboot_target.py       |  128 ---
(Continue reading)

Brian Dolbec | 11 Sep 05:43 2014
Picon

[PATCH 0/5] Next group of 5 patches

Another five patches of various changes, moving towards the 3.0 code.

Brian Dolbec (5):
  Some options cleanup, unifying their use, reducing redundancy.
  Move LockInUse from support.py to lock.py, fix bad execption raising, 
    pyflakes cleanup
  Begin splitting up generic_stage_target into smaller code blocks.
  Some spacing, comment and indent cleanup
  Remove redundant /bin/bash additions in cmd() calls

 catalyst/defaults.py                     |  24 +-
 catalyst/lock.py                         |  55 +++--
 catalyst/main.py                         |  99 +++-----
 catalyst/support.py                      | 403 ++++++-------------------------
 catalyst/targets/clearbase.py            | 115 +++++++++
 catalyst/targets/genbase.py              |  58 +++++
 catalyst/targets/generic_stage_target.py | 325 +++++++++----------------
 catalyst/targets/generic_target.py       |  15 --
 catalyst/targets/grp_target.py           |   4 +-
 catalyst/targets/livecd_stage1_target.py |   2 +-
 catalyst/targets/livecd_stage2_target.py |   8 +-
 catalyst/targets/netboot2_target.py      |  14 +-
 catalyst/targets/netboot_target.py       |   8 +-
 catalyst/targets/snapshot_target.py      |  20 +-
 catalyst/targets/stage2_target.py        |   2 +-
 catalyst/targets/stage4_target.py        |   4 +-
 catalyst/targets/targetbase.py           |  15 ++
 catalyst/targets/tinderbox_target.py     |   2 +-
 18 files changed, 488 insertions(+), 685 deletions(-)
 create mode 100644 catalyst/targets/clearbase.py
(Continue reading)

Brian Dolbec | 2 Sep 04:31 2014
Picon

[PATCH 0/7] Pending branch patches (various)


These are several small patches fixing a few bugs nad upcoming 
fixes for the new portage ebuild (patches 3,4).  
Patch 6 fixes the setup_pkgmgr() adding the 'build' use flag 
to all stages calling the function.

Brian Dolbec (7):
  Remove unused urllib import.
  Remove unused variable new and an undefined variable s.
  stage1-controller.sh: Fix portage bin path hard coding
  chroot-functions.sh: Remove --nodeps option from portage update.
  chroot-functions.sh: Fix a mis-worded comment
  setup_pkgmgr(): WIP Make the 'build' use flag optional
  Fix a relative path bug

 catalyst/support.py                 | 12 ------------
 targets/stage1/stage1-chroot.sh     |  1 +
 targets/stage1/stage1-controller.sh |  6 +++---
 targets/stage2/stage2-chroot.sh     |  1 +
 targets/support/chroot-functions.sh | 15 +++++++++++----
 targets/support/functions.sh        |  2 +-
 6 files changed, 17 insertions(+), 20 deletions(-)

--

-- 
1.9.3

Raúl Porcel | 24 Jun 18:49 2014
Picon

Fwd: spaces in parameters

I never got any answer from genkernel.

Can we implement the workaround in catalyst somehow?

Thanks

-------- Original Message --------
Subject: spaces in parameters
Date: Wed, 21 Aug 2013 11:11:00 +0200
From: Raúl Porcel <armin76@...>
To: gentoo-genkernel@...
CC: release@...

Hi,

when using catalyst, it passes some parameters to genkernel. Now it
turns out I need to use some parameters with spaces in genkernel and
seems it doesn't like them.

Right now catalyst does something like this script:

#######
parm="--kernel-cc='gcc -m64'
--kernel-config=/root/installcd-ibm-2.6.34.config all"

genkernel ${parm}
#######

This returns:
Error: Unknown option '-m64''!
(Continue reading)

Brian Dolbec | 2 Apr 22:29 2014
Picon

[PATCH 2/8] Initial separation and creation of contents.py

---
 catalyst/contents.py                     | 87 ++++++++++++++++++++++++++++++++
 catalyst/main.py                         |  8 ++-
 catalyst/support.py                      | 52 -------------------
 catalyst/targets/generic_stage_target.py |  3 +-
 4 files changed, 96 insertions(+), 54 deletions(-)
 create mode 100644 catalyst/contents.py

diff --git a/catalyst/contents.py b/catalyst/contents.py
new file mode 100644
index 0000000..79ef9a6
--- /dev/null
+++ b/catalyst/contents.py
 <at>  <at>  -0,0 +1,87  <at>  <at> 
+
+from collections import namedtuple
+from subprocess import Popen, PIPE
+
+from support import CatalystError, warn
+
+
+# use ContentsMap.fields for the value legend
+# Key:[function, cmd]
+CONTENTS_DEFINITIONS = {
+	# 'find' is disabled because it requires the source path, which is not
+	# always available
+	#"find"		:["calc_contents","find %(path)s"],
+	"tar_tv":["calc_contents","tar tvf %(file)s"],
+	"tar_tvz":["calc_contents","tar tvzf %(file)s"],
+	"tar_tvj":["calc_contents","tar -I lbzip2 -tvf %(file)s"],
(Continue reading)

Brian Dolbec | 3 Apr 01:46 2014
Picon

Patch 0/8 Remaining patches in pending.

[PATCH 1/8] Initial separation and creation of a hash_utils.py module

Well, that was a crappy way for git send-email to react.  
First when cancelling, it only cancelled the cover letter and the first commit.
And without entering an email address.  Second time it didn't send the cover and the 1/8 commit.
I didn't meant to group these together, but, since theyre on the list...

Brian Dolbec | 22 Mar 18:02 2014
Picon

2.X bugfixes

Due to the firmware bug fixed by the first patch in this series which needs
to be released and used for production of install media. I took the opportunity
To add all the other bug fixes from the pending and 3.0 branches.  This 
includes a few convenience commits like the 2 chmod ones.  I would like to 
push these to the main repo and make a release.

They are currently available for testing in my github account.

git remote add dolsen-github git@...:dol-sen/catalyst.git
git fetch dolsen-github
git checkout dolsen-github/2.X

 [PATCH 01/17] livecdfs-update: No tmpfs on /lib/firmware
 [PATCH 02/17] update-modules doesn't exists anymore.
 [PATCH 03/17] depscan.sh doesn't exists anymore.
 [PATCH 04/17] /etc/conf.d/rc doesn't exists anymore.
 [PATCH 05/17] Fix merging kernel without kerncache enabled.
 [PATCH 06/17] Rename System.map in a way that it won't be matched if
 [PATCH 07/17] Allow kernelopts as a valid value for kernels.
 [PATCH 08/17] Make use of _kernelopts for hppa.
 [PATCH 09/17] Fix and improve kernel build when kerncache is enabled.
 [PATCH 10/17] Don't make cdtar mandatory.
 [PATCH 11/17] Use the system's iplboot to be sure it matches palo's
 [PATCH 12/17] Remove unused hppa cdtar.
 [PATCH 13/17] chmod +x all sh scripts so they can run from the git
 [PATCH 14/17] chmod +x targets/stage1/build.py
 [PATCH 15/17] Add more working files, directories to .gitignore
 [PATCH 16/17] Fix undefined variable: RLIMIT_NOFILE
 [PATCH 17/17] Fix a relative path bug

(Continue reading)

Brian Dolbec | 3 Mar 00:07 2014
Picon

[PATCH] Commit a testpath file to source with instructions on it's use.

Make testpath automagic via dwfeed's tweak
Update HOWTO on how to run the git checkout code directly without being installed.
---
 doc/HOWTO.txt | 10 ++++++++--
 testpath      | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 testpath

diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
index 8fe63c1..cec22c3 100644
--- a/doc/HOWTO.txt
+++ b/doc/HOWTO.txt
 <at>  <at>  -233,9 +233,15  <at>  <at>  Running catalyst from a Git checkout

 If you're developing catalyst, you'll want to test your altered
 version.  An easy way to run it without reinstalling is to setup a
-local configuration file and run:
+local configuration file.  The checkout also includes a testpath file
+which when sourced adds it's bin/ to PATH and it's checkout dir to
+PYTHONPATH.  That terminal will then use the checkout bin/catalyst and
+the checkout's python modules.

-    # ./catalyst -c catalyst.conf -f path/to/your.spec
+cd into the checkout directory and run:
+
+    # source ./testpath
+    # catalyst -c catalyst.conf -f path/to/your.spec

 The local configuration file can use all the defaults except for
 `sharedir`, which you should change to point to your development
(Continue reading)

Brian Dolbec | 3 Mar 00:05 2014
Picon

[PATCH] Fix autoresume file paths to only be configured once.

Use: pjoin as a shorter alias to os.path.join()
---
 catalyst/targets/generic_stage_target.py | 175 +++++++++++++++++--------------
 1 file changed, 95 insertions(+), 80 deletions(-)

diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py
index 2b3d7ce..095327a 100644
--- a/catalyst/targets/generic_stage_target.py
+++ b/catalyst/targets/generic_stage_target.py
 <at>  <at>  -33,6 +33,9  <at>  <at>  SOURCE_MOUNTS_DEFAULTS = {
 	"shm": "shmfs",
 	}

+# for convienience
+pjoin = os.path.join
+

 class generic_stage_target(generic_target):
 	"""
 <at>  <at>  -334,9 +337,10  <at>  <at>  class generic_stage_target(generic_target):
 	def set_target_path(self):
 		self.settings["target_path"]=normpath(self.settings["storedir"]+\
 			"/builds/"+self.settings["target_subpath"]+".tar.bz2")
-		if "AUTORESUME" in self.settings\
-			and os.path.exists(self.settings["autoresume_path"]+\
-				"setup_target_path"):
+		setup_target_path_resume = pjoin(self.settings["autoresume_path"],
+			"setup_target_path")
+		if "AUTORESUME" in self.settings and \
+				os.path.exists(setup_target_path_resume):
(Continue reading)

Brian Dolbec | 3 Mar 00:00 2014
Picon

[PATCH 2/5] generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror

---
 catalyst/targets/generic_stage_target.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py
index 095327a..7fd583e 100644
--- a/catalyst/targets/generic_stage_target.py
+++ b/catalyst/targets/generic_stage_target.py
 <at>  <at>  -470,10 +470,10  <at>  <at>  class generic_stage_target(generic_target):
 					hash_function=self.settings["hash_function"],verbose=False)

 	def set_snapcache_path(self):
+		self.settings["snapshot_cache_path"] = \
+			normpath(self.settings["snapshot_cache"] + "/" +
+				self.settings["snapshot"])
 		if "SNAPCACHE" in self.settings:
-			self.settings["snapshot_cache_path"] = \
-				normpath(self.settings["snapshot_cache"] + "/" +
-					self.settings["snapshot"])
 			self.snapcache_lock=\
 				LockDir(self.settings["snapshot_cache_path"])
 			print "Caching snapshot to "+self.settings["snapshot_cache_path"]

Gmane