* [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch
@ 2014-09-11 4:01 Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 1/6] FIXME! Comment out a small code block causing TypeError Brian Dolbec
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Brian Dolbec @ 2014-09-11 4:01 UTC (permalink / raw
To: gentoo-catalyst
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 +++++------
targets/support/bootloader-setup.sh | 6 +--
targets/support/create-iso.sh | 4 +-
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 +-
targets/support/target_image_setup.sh | 4 +-
targets/tinderbox/tinderbox-controller.sh | 6 +--
23 files changed, 142 insertions(+), 121 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-catalyst] [PATCH 1/6] FIXME! Comment out a small code block causing TypeError.
2014-09-11 4:01 [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch Brian Dolbec
@ 2014-09-11 4:01 ` Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 2/6] Break out more repeated (path1 + path2)'s Brian Dolbec
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Brian Dolbec @ 2014-09-11 4:01 UTC (permalink / raw
To: gentoo-catalyst
This was also short circuiting another large code block. FIXME!!!! This
whole class seems overly complicated with TOO MANY nested try:excepts:
---
catalyst/lock.py | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/catalyst/lock.py b/catalyst/lock.py
index 78968cb..c90f5b8 100644
--- a/catalyst/lock.py
+++ b/catalyst/lock.py
@@ -27,11 +27,17 @@ class LockDir:
locking_method=fcntl.flock
lock_dirs_in_use=[]
die_on_failed_lock=True
+
def __del__(self):
+ #print "Lock.__del__() 1"
self.clean_my_hardlocks()
+ #print "Lock.__del__() 2"
self.delete_lock_from_path_list()
+ #print "Lock.__del__() 3"
if self.islocked():
+ #print "Lock.__del__() 4"
self.fcntl_unlock()
+ #print "Lock.__del__() finnished"
def __init__(self,lockdir):
self.locked=False
@@ -179,7 +185,9 @@ class LockDir:
unlinkfile = 1
if not os.path.exists(self.lockfile):
print "lockfile does not exist '%s'" % self.lockfile
+ #print "fcntl_unlock() , self.myfd:", self.myfd, type(self.myfd)
if (self.myfd != None):
+ #print "fcntl_unlock() trying to close it "
try:
os.close(self.myfd)
self.myfd=None
@@ -193,11 +201,13 @@ class LockDir:
unlinkfile = 1
self.locking_method(self.myfd,fcntl.LOCK_UN)
except SystemExit, e:
- raise
+ raise e
except Exception, e:
- os.close(self.myfd)
- self.myfd=None
- raise IOError, "Failed to unlock file '%s'\n" % self.lockfile
+ #if self.myfd is not None:
+ #print "fcntl_unlock() trying to close", self.myfd
+ #os.close(self.myfd)
+ #self.myfd=None
+ #raise IOError, "Failed to unlock file '%s'\n%s" % (self.lockfile, str(e))
try:
# This sleep call was added to allow other processes that are
# waiting for a lock to be able to grab it before it is deleted.
@@ -224,7 +234,7 @@ class LockDir:
# if "DEBUG" in self.settings:
# print "Unlinked lockfile..."
except SystemExit, e:
- raise
+ raise e
except Exception, e:
# We really don't care... Someone else has the lock.
# So it is their problem now.
@@ -236,7 +246,7 @@ class LockDir:
# open fd closed automatically on them.
#if type(lockfilename) == types.StringType:
# os.close(myfd)
-
+ #print "fcntl_unlock() trying a last ditch close", self.myfd
if (self.myfd != None):
os.close(self.myfd)
self.myfd=None
@@ -421,6 +431,7 @@ class LockDir:
pass
return results
+
if __name__ == "__main__":
def lock_work():
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-catalyst] [PATCH 2/6] Break out more repeated (path1 + path2)'s...
2014-09-11 4:01 [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 1/6] FIXME! Comment out a small code block causing TypeError Brian Dolbec
@ 2014-09-11 4:01 ` Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 3/6] Rename a make.conf key to make_conf due to bash variable name restrictions Brian Dolbec
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Brian Dolbec @ 2014-09-11 4:01 UTC (permalink / raw
To: gentoo-catalyst
Just do it once and use the temp variable.
Comment out some debug print's.
Fix options conversion for export to bash.
---
catalyst/base/stagebase.py | 43 ++++++++++++++++++++++---------------------
catalyst/defaults.py | 2 ++
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index bebb5dc..b44a957 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -631,11 +631,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
"""
self.setup_environment()
- if os.path.exists(self.settings["sharedir"]+\
- "/targets/support/kill-chroot-pids.sh"):
- cmd("/bin/bash "+self.settings["sharedir"]+\
- "/targets/support/kill-chroot-pids.sh",\
- "kill-chroot-pids script failed.",env=self.env)
+ killcmd = normpath(self.settings["sharedir"] +
+ self.settings["shdir"] + "/support/kill-chroot-pids.sh")
+ if os.path.exists(killcmd):
+ cmd(killcmd, "kill-chroot-pids script failed.",env=self.env)
def mount_safety_check(self):
"""
@@ -647,10 +646,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
if not os.path.exists(self.settings["chroot_path"]):
return
- print "self.mounts =", self.mounts
+ #print "self.mounts =", self.mounts
for x in self.mounts:
target = normpath(self.settings["chroot_path"] + self.target_mounts[x])
- print "mount_safety_check() x =", x, target
+ #print "mount_safety_check() x =", x, target
if not os.path.exists(target):
continue
@@ -1020,8 +1019,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
"Couldn't umount one or more bind-mounts; aborting for safety."
def chroot_setup(self):
- self.makeconf=read_makeconf(self.settings["chroot_path"]+\
- "/etc/portage/make.conf")
+ self.makeconf=read_makeconf(normpath(self.settings["chroot_path"]+
+ self.settings["make.conf"]))
self.override_cbuild()
self.override_chost()
self.override_cflags()
@@ -1035,8 +1034,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
print "Setting up chroot..."
- #self.makeconf=read_makeconf(self.settings["chroot_path"]+"/etc/portage/make.conf")
-
cmd("cp /etc/resolv.conf " + self.settings["chroot_path"] + "/etc/",
"Could not copy resolv.conf into place.",env=self.env)
@@ -1070,10 +1067,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
"Could not copy /etc/hosts",env=self.env)
""" Modify and write out make.conf (for the chroot) """
- cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.conf",\
- "Could not remove "+self.settings["chroot_path"]+\
- "/etc/portage/make.conf",env=self.env)
- myf=open(self.settings["chroot_path"]+"/etc/portage/make.conf","w")
+ makepath = normpath(self.settings["chroot_path"] +
+ self.settings["make.conf"])
+ cmd("rm -f " + makepath,\
+ "Could not remove " + makepath, env=self.env)
+ myf=open(makepath, "w")
myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n")
myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n")
if "CFLAGS" in self.settings:
@@ -1123,10 +1121,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write('PORTDIR_OVERLAY="/usr/local/portage"\n')
myf.close()
- cmd("cp "+self.settings["chroot_path"]+"/etc/portage/make.conf "+\
- self.settings["chroot_path"]+"/etc/portage/make.conf.catalyst",\
- "Could not backup /etc/portage/make.conf",env=self.env)
- touch(chroot_setup_resume)
+ makepath = normpath(self.settings["chroot_path"] +
+ self.settings["make.conf"])
+ cmd("cp " + makepath + " " + makepath + ".catalyst",\
+ "Could not backup " + self.settings["make.conf"],env=self.env)
+ touch(self.settings["autoresume_path"]+"chroot_setup")
def fsscript(self):
fsscript_resume = pjoin(self.settings["autoresume_path"], "fsscript")
@@ -1289,6 +1288,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:
try:
if os.path.exists(self.settings["controller_file"]):
+ print "run_local() starting controller script..."
cmd(self.settings["controller_file"]+" run",\
"run script failed.",env=self.env)
touch(run_local_resume)
@@ -1324,11 +1324,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.env[varname]=string.join(self.settings[x])
elif type(self.settings[x])==types.BooleanType:
if self.settings[x]:
- self.env[varname]="true"
+ self.env[varname] = "true"
else:
- self.env[varname]="false"
+ self.env[varname] = "false"
if "makeopts" in self.settings:
self.env["MAKEOPTS"]=self.settings["makeopts"]
+ #print "setup_environment(); env =", self.env
def run(self):
self.chroot_lock.write_lock()
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index f6b2163..ce7e919 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -25,12 +25,14 @@ confdefaults={
"hash_function": "crc32",
"icecream": "/var/cache/icecream",
"local_overlay": "/usr/local/portage",
+ "make.conf": "/etc/portage/make.conf",
"options": "",
"packagedir": "/usr/portage/packages",
"portdir": "/usr/portage",
"port_tmpdir": "/var/tmp/portage",
"repo_name": "portage",
"sharedir": "/usr/lib/catalyst",
+ "shdir": "/usr/lib/catalyst/targets/",
"snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
"snapshot_name": "portage-",
"storedir": "/var/tmp/catalyst",
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-catalyst] [PATCH 3/6] Rename a make.conf key to make_conf due to bash variable name restrictions
2014-09-11 4:01 [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 1/6] FIXME! Comment out a small code block causing TypeError Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 2/6] Break out more repeated (path1 + path2)'s Brian Dolbec
@ 2014-09-11 4:01 ` Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 4/6] reduce 2 operations into one simpler one Brian Dolbec
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Brian Dolbec @ 2014-09-11 4:01 UTC (permalink / raw
To: gentoo-catalyst
---
catalyst/base/stagebase.py | 10 +++++-----
catalyst/defaults.py | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index b44a957..96b1c19 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 ce7e919..2839a3d 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -25,8 +25,8 @@ confdefaults={
"hash_function": "crc32",
"icecream": "/var/cache/icecream",
"local_overlay": "/usr/local/portage",
- "make.conf": "/etc/portage/make.conf",
- "options": "",
+ "make_conf": "/etc/portage/make.conf",
+ "options": set(),
"packagedir": "/usr/portage/packages",
"portdir": "/usr/portage",
"port_tmpdir": "/var/tmp/portage",
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-catalyst] [PATCH 4/6] reduce 2 operations into one simpler one
2014-09-11 4:01 [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch Brian Dolbec
` (2 preceding siblings ...)
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 3/6] Rename a make.conf key to make_conf due to bash variable name restrictions Brian Dolbec
@ 2014-09-11 4:01 ` Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 5/6] Extend ParserBase to do variable substitution Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 6/6] Make shdir a complete path to ease it's use Brian Dolbec
5 siblings, 0 replies; 7+ messages in thread
From: Brian Dolbec @ 2014-09-11 4:01 UTC (permalink / raw
To: gentoo-catalyst
---
catalyst/config.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/catalyst/config.py b/catalyst/config.py
index 460bbd5..8b23342 100644
--- a/catalyst/config.py
+++ b/catalyst/config.py
@@ -54,11 +54,7 @@ class ParserBase:
# Skip any blank lines
if not myline: continue
- # Look for separator
- msearch = myline.find(self.key_value_separator)
-
- # If separator found assume its a new key
- if msearch != -1:
+ if self.key_value_separator in myline:
# Split on the first occurence of the separator creating two strings in the array mobjs
mobjs = myline.split(self.key_value_separator, 1)
mobjs[1] = mobjs[1].strip().strip('"')
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-catalyst] [PATCH 5/6] Extend ParserBase to do variable substitution.
2014-09-11 4:01 [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch Brian Dolbec
` (3 preceding siblings ...)
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 4/6] reduce 2 operations into one simpler one Brian Dolbec
@ 2014-09-11 4:01 ` Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 6/6] Make shdir a complete path to ease it's use Brian Dolbec
5 siblings, 0 replies; 7+ messages in thread
From: Brian Dolbec @ 2014-09-11 4:01 UTC (permalink / raw
To: gentoo-catalyst
Also add embedded variable substitiution to default settings.
Why are we not using python's built-in ConfigParser?
We'll migrate it later.
---
catalyst/config.py | 3 +++
catalyst/main.py | 6 +++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/catalyst/config.py b/catalyst/config.py
index 8b23342..bf3c7c6 100644
--- a/catalyst/config.py
+++ b/catalyst/config.py
@@ -66,6 +66,9 @@ class ParserBase:
# Start a new array using the first element of mobjs
cur_array = [mobjs[0]]
if mobjs[1]:
+ # do any variable substitiution embeded in it with
+ # the values already obtained
+ mobjs[1] = mobjs[1] % values
if self.multiple_values:
# split on white space creating additional array elements
# subarray = white_space.split(mobjs[1])
diff --git a/catalyst/main.py b/catalyst/main.py
index 1446cf9..5fa3f1b 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -116,7 +116,6 @@ def parse_config(myconfig):
# add our python base directory to use for loading target arch's
conf_values["PythonDir"] = __selfpath__
-
# print out any options messages
for opt in conf_values['options']:
if opt in option_messages:
@@ -133,6 +132,11 @@ def parse_config(myconfig):
if "envscript" in myconf:
print "Envscript support enabled."
+ # take care of any variable substitutions that may be left
+ for x in list(conf_values):
+ if isinstance(conf_values[x], str):
+ conf_values[x] = conf_values[x] % conf_values
+
def import_module(target):
"""
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-catalyst] [PATCH 6/6] Make shdir a complete path to ease it's use.
2014-09-11 4:01 [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch Brian Dolbec
` (4 preceding siblings ...)
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 5/6] Extend ParserBase to do variable substitution Brian Dolbec
@ 2014-09-11 4:01 ` Brian Dolbec
5 siblings, 0 replies; 7+ messages in thread
From: Brian Dolbec @ 2014-09-11 4:01 UTC (permalink / raw
To: gentoo-catalyst
Add a "shdir" setting to config.
This is to make moving the bash code around easier.
It also reduces more hardcoded paths in the bash scripts.
Migrate all target shell scripts to use the new shdir setting
---
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 ++++++++++-----------
targets/support/bootloader-setup.sh | 6 +++---
targets/support/create-iso.sh | 4 ++--
targets/support/functions.sh | 2 +-
targets/support/netboot2-final.sh | 4 ++--
targets/support/target_image_setup.sh | 4 ++--
targets/tinderbox/tinderbox-controller.sh | 6 +++---
18 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2d377b2..d52a5c8 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -73,10 +73,14 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
# portdir specifies the source portage tree used by the snapshot target.
portdir="/usr/portage"
-# sharedir specifies where all of the catalyst runtime executables are. Most
-# users do not need to change this.
+# sharedir specifies where all of the catalyst runtime executables
+# and other shared lib objects are.
+# Most users do not need to change this.
sharedir="/usr/lib/catalyst"
+# shdir specifies where all of the catalyst runtime executables are.
+shdir="%(sharedir)s/targets"
+
# snapshot_cache specifies where the snapshots will be cached to if snapcache is
# enabled in the options.
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
index 2a0c5fe..c0b62ea 100755
--- a/targets/embedded/embedded-controller.sh
+++ b/targets/embedded/embedded-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
enter)
@@ -11,7 +11,7 @@ case ${1} in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
@@ -21,7 +21,7 @@ case ${1} in
# export root_fs_path="${clst_chroot_path}/tmp/mergeroot"
# install -d ${clst_image_path}
-# ${clst_sharedir}/targets/embedded/embedded-fs-runscript.sh \
+# ${clst_shdir}/embedded/embedded-fs-runscript.sh \
# ${clst_embedded_fs_type} || exit 1
# imagesize=`du -sk ${clst_image_path}/root.img | cut -f1`
# echo "Created ${clst_embedded_fs_type} image at \
@@ -31,12 +31,12 @@ case ${1} in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -47,18 +47,18 @@ case ${1} in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh ${1}
+ ${clst_shdir}/support/target_image_setup.sh ${1}
;;
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
;;
bootloader)
@@ -66,12 +66,12 @@ case ${1} in
# Here is where we poke in our identifier
touch ${1}/livecd
- ${clst_sharedir}/targets/support/bootloader-setup.sh ${1}
+ ${clst_shdir}/support/bootloader-setup.sh ${1}
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh ${1}
+ ${clst_shdir}/support/create-iso.sh ${1}
;;
clean)
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
index 541429a..0f1a5b5 100755
--- a/targets/grp/grp-controller.sh
+++ b/targets/grp/grp-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
@@ -15,11 +15,11 @@ case $1 in
shift
export clst_grp_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/grp/grp-preclean-chroot.sh
;;
clean)
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index f3b1f40..19b8dd1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,5 +1,5 @@
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
## START RUNSCRIPT
@@ -9,7 +9,7 @@ case $1 in
export clst_packages="$*"
mkdir -p ${clst_chroot_path}/usr/livecd ${clst_chroot_path}/tmp
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
echo "${clst_packages}" > ${clst_chroot_path}/tmp/packages.txt
;;
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 57dcff7..a98cb47 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,16 +1,16 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -22,7 +22,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
@@ -79,7 +79,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -92,7 +92,7 @@ case $1 in
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -182,23 +182,23 @@ case $1 in
;;
esac
- ${clst_sharedir}/targets/support/bootloader-setup.sh $1
+ ${clst_shdir}/support/bootloader-setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
esac
exit $?
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index e4294ca..d5312fb 100755
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/chroot-functions.sh
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/chroot-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
update_env_settings
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index edf1f21..93feb26 100755
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
@@ -11,7 +11,7 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
busybox)
@@ -30,26 +30,26 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} -O" \
clst_packages="busybox" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
shift
export clst_kname="$1"
export clst_root_path="/"
- #exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
- #exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/kmerge.sh
+ #exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
#extract_kernels kernels
;;
@@ -61,15 +61,15 @@ case ${1} in
clst_myemergeopts="${clst_myemergeopts} --nodeps" \
clst_packages="netboot-base" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-image.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-image.sh
;;
finish)
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-combine.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-combine.sh
;;
clean)
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
index 2ffcb0d..be5f91d 100755
--- a/targets/netboot2/netboot2-controller.sh
+++ b/targets/netboot2/netboot2-controller.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
case ${1} in
build_packages)
@@ -10,17 +10,17 @@ case ${1} in
clst_root_path="/" \
clst_packages="$*" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-pkg.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-pkg.sh
;;
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -37,7 +37,7 @@ case ${1} in
cp ${clst_busybox_config} ${clst_chroot_path}/tmp/busy-config
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
delete_from_chroot tmp/busy-config
@@ -56,13 +56,13 @@ case ${1} in
# Copy remaining files over to the initramfs target
clst_files="${@}" \
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-copyfile.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-copyfile.sh
;;
final)
# For each arch, fetch the kernel images and put them in builds/
echo -e ">>> Copying completed kernels to ${clst_target_path} ..."
- ${clst_sharedir}/targets/support/netboot2-final.sh
+ ${clst_shdir}/support/netboot2-final.sh
;;
clean)
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index d029545..09a121d 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,13 +1,13 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
enter)
;;
run)
- cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
+ cp ${clst_shdir}/stage1/build.py ${clst_chroot_path}/tmp
# Setup "ROOT in chroot" dir
install -d ${clst_chroot_path}${clst_root_path}/etc
@@ -18,12 +18,12 @@ case $1 in
# Enter chroot, execute our build script
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh \
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh \
|| exit 1
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh || exit 1
;;
clean)
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
index 69ba7c9..25e5120 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -13,11 +13,11 @@ case $1 in
shift
export clst_packages="$*"
exec_in_chroot \
- ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
index ff546f8..df1479e 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -12,11 +12,11 @@ case $1 in
run)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
clean)
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index ff8dc03..d42f302 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
# Only put commands in this section that you want every target to execute.
# This is a global default file and will affect every target
@@ -11,12 +11,12 @@ case $1 in
pre-kmerge)
# Sets up the build environment before any kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
post-kmerge)
# Cleans up the build environment after the kernels are compiled
- exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/post-kmerge.sh
;;
kernel)
@@ -27,7 +27,7 @@ case $1 in
then
cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
fi
- exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
+ exec_in_chroot ${clst_shdir}/support/kmerge.sh
delete_from_chroot tmp/linuxrc
extract_modules ${clst_chroot_path} ${clst_kname}
# Do we need this one?
@@ -37,15 +37,15 @@ case $1 in
build_packages)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
- exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
+ exec_in_chroot ${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
rc-update)
- exec_in_chroot ${clst_sharedir}/targets/support/rc-update.sh
+ exec_in_chroot ${clst_shdir}/support/rc-update.sh
;;
fsscript)
@@ -54,7 +54,7 @@ case $1 in
livecd-update)
# Now, finalize and tweak the livecd fs (inside of the chroot)
- exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh
+ exec_in_chroot ${clst_shdir}/support/livecdfs-update.sh
# Move over the xinitrc (if applicable)
# This is moved here, so we can override any default xinitrc
@@ -71,18 +71,18 @@ case $1 in
target_image_setup)
shift
- ${clst_sharedir}/targets/support/target_image_setup.sh $1
+ ${clst_shdir}/support/target_image_setup.sh $1
;;
unmerge)
shift
export clst_packages="$*"
- exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh
+ exec_in_chroot ${clst_shdir}/support/unmerge.sh
;;
iso)
shift
- ${clst_sharedir}/targets/support/create-iso.sh $1
+ ${clst_shdir}/support/create-iso.sh $1
;;
clean)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..857ce6f 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# $1 is the destination root
@@ -455,7 +455,7 @@ case ${clst_hostarch} in
[ -d "${1}/boot" ] && rmdir ${1}/boot
# Source the arcload source file to generated required sections of arc.cf
- source ${clst_sharedir}/targets/support/mips-arcload_conf.sh
+ source ${clst_shdir}/support/mips-arcload_conf.sh
# Generate top portions of the config
echo -e "${topofconfig}${serial}${dbg}${cmt1}" >> ${scratch}/arc.cf
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..08598e5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
## START RUNSCRIPT
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 0894b35..9419b2b 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,7 +24,7 @@ exec_in_chroot(){
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
- copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+ copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
${destdir}
chroot_path=${clst_chroot_path}${subdir}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..55835d2 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
extract_kernels ${clst_target_path}boot
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b9e2781..b428d4e 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,6 +1,6 @@
-source ${clst_sharedir}/targets/support/functions.sh
-source ${clst_sharedir}/targets/support/filesystem-functions.sh
+source ${clst_shdir}/support/functions.sh
+source ${clst_shdir}/support/filesystem-functions.sh
# Make the directory if it doesnt exist
mkdir -p $1
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index d7d89cb..3dbc76f 100755
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,14 +1,14 @@
#!/bin/bash
-source ${clst_sharedir}/targets/support/functions.sh
+source ${clst_shdir}/support/functions.sh
case $1 in
run)
shift
- exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
+ exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-chroot.sh
;;
preclean)
- #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
+ #exec_in_chroot ${clst_shdir}/tinderbox/tinderbox-preclean-chroot.sh
delete_from_chroot /tmp/chroot-functions.sh
;;
clean)
--
2.1.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-09-11 4:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-11 4:01 [gentoo-catalyst] [PATCH 0/6] Various changes towards 3.0 branch Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 1/6] FIXME! Comment out a small code block causing TypeError Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 2/6] Break out more repeated (path1 + path2)'s Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 3/6] Rename a make.conf key to make_conf due to bash variable name restrictions Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 4/6] reduce 2 operations into one simpler one Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 5/6] Extend ParserBase to do variable substitution Brian Dolbec
2014-09-11 4:01 ` [gentoo-catalyst] [PATCH 6/6] Make shdir a complete path to ease it's use Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox