[gentoo-commits] proj/catalyst:catalyst_use commit in: catalyst/base/
commit: c163427598c73941349a596d1435d065c4d7ec9b Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sat Mar 11 00:27:35 2017 + Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sat Mar 11 00:27:35 2017 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c1634275 White space. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> catalyst/base/stagebase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 0d36e33..417c198 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -553,8 +553,8 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_catalyst_use(self): if self.settings["spec_prefix"] + "/catalyst_use" in self.settings: self.settings["catalyst_use"] = \ - self.settings[self.settings["spec_prefix"]+"/catalyst_use"] - del self.settings[self.settings["spec_prefix"]+"/catalyst_use"] + self.settings[self.settings["spec_prefix"] + "/catalyst_use"] + del self.settings[self.settings["spec_prefix"] + "/catalyst_use"] if "catalyst_use" not in self.settings: self.settings["catalyst_use"] = "" if isinstance(self.settings['catalyst_use'], str):
[gentoo-commits] proj/catalyst:catalyst_use commit in: catalyst/base/
commit: b2138541f56bb777df703c854e61f90972d00359
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Mon Feb 6 03:35:34 2017 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Mar 7 17:06:59 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2138541
stagebase.py: Whitespace cleanups
Add spaces around '=', after ','
Some long line cleanup.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)
gentoo.org>
catalyst/base/stagebase.py | 532 +++--
1 file changed, 271 insertions(+), 261 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 68ccb79..78fd67f 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -32,13 +32,15 @@ class StageBase(TargetBase, ClearBase, GenBase):
the driver class for pretty much everything that Catalyst does.
"""
def __init__(self,myspec,addlargs):
-
self.required_values.extend(["version_stamp","target","subarch",\
- "rel_type","profile","snapshot","source_subpath"])
-
- self.valid_values.extend(["version_stamp","target","subarch",
-
"rel_type","profile","snapshot","source_subpath","portage_confdir",
-
"cflags","cxxflags","fcflags","fflags","ldflags","asflags","cbuild","hostuse","portage_overlay",
-
"distcc_hosts","makeopts","pkgcache_path","kerncache_path",
+ self.required_values.extend(["version_stamp", "target",
"subarch",
+ "rel_type", "profile", "snapshot", "source_subpath"])
+
+ self.valid_values.extend(["version_stamp", "target", "subarch",
+ "rel_type", "profile", "snapshot", "source_subpath",
+ "portage_confdir", "portage_prefix", "portage_overlay",
+ "cflags", "cxxflags", "fcflags", "fflags", "ldflags",
"asflags",
+ "cbuild", "hostuse", "catalyst_use",
+ "distcc_hosts", "makeopts", "pkgcache_path",
"kerncache_path",
"compression_mode", "decompression_mode"])
self.set_valid_build_kernel_vars(addlargs)
@@ -73,16 +75,18 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.subarchmap = {}
machinemap = {}
arch_dir = self.settings["archdir"] + "/"
- for x in [x[:-3] for x in os.listdir(arch_dir) if
x.endswith(".py") and x != "__init__.py"]:
+ for x in [
+ x[:-3] for x in os.listdir(arch_dir) if
x.endswith(".py")
+ and x != "__init__.py"]:
log.debug("Begin loading arch modules...")
try:
- fh=open(arch_dir + x + ".py")
- # This next line loads the plugin as a module
and assigns it to
- # archmap[x]
- self.archmap[x]=imp.load_module(x,fh, arch_dir
+ x + ".py",
+ fh = open(arch_dir + x + ".py")
+ # This next line loads the plugin as a module
and
+ # assigns it to archmap[x]
+ self.archmap[x] = imp.load_module(x, fh,
arch_dir + x + ".py",
(".py", "r", imp.PY_SOURCE))
- # This next line registers all the subarches
supported in the
- # plugin
+ # This next line registers all the subarches
+ # supported in the plugin
tmpsubarchmap, tmpmachinemap =
self.archmap[x].register()
self.subarchmap.update(tmpsubarchmap)
for machine in tmpmachinemap:
@@ -100,26 +104,26 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "chost" in self.settings:
hostmachine = self.settings["chost"].split("-")[0]
if hostmachine not in machinemap:
- raise CatalystError("Unknown host machine type
"+hostmachine)
- self.settings["hostarch"]=machinemap[hostmachine]
+ raise CatalystError("Unknown host machine type
" + hostmachine)
+ self.settings["hostarch"] = machinemap[hostmachine]
else:
hostmachine = self.settings["subarch"]
if hostmachine in machinemap:
hostmachine = machinemap[hostmachine]
- self.settings["hostarch"]=hostmachine
+ self.settings["hostarch"] = hostmachine
if "cbuild"
[gentoo-commits] proj/catalyst:catalyst_use commit in: catalyst/base/, targets/support/
commit: 95086109d6bd6a9d841c43abd53234ed2a220acf
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Mon Mar 6 10:52:19 2017 +
Commit: Jorge Manuel B. S. Vicetto gentoo org>
CommitDate: Mon Mar 6 10:52:19 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=95086109
Fix portage_prefix, output to log some changes and remove unneeded
set_portage_prefix.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)
gentoo.org>
catalyst/base/stagebase.py | 4
targets/support/functions.sh | 11 ++-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index f0b62d7..417c198 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -601,10 +601,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
log.info('portage_overlay directories are set to: %s',
' '.join(self.settings['portage_overlay']))
-# def set_portage_prefix(self):
-# if "portage_prefix" in self.settings:
-# self.settings["portage_prefix"] = ""
-
def set_overlay(self):
if self.settings["spec_prefix"] + "/overlay" in self.settings:
if
isinstance(self.settings[self.settings['spec_prefix'] + '/overlay'], str):
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index eded8b7..63000a5 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -24,11 +24,20 @@ prepare_portage() {
clear_portage() {
# Clean-up USE again
+ echo "Drop \$CATALYST_USE from USE"
sed -i "/USE=\"/s/\${CATALYST_USE} //" ${clst_make_conf}
+ echo "Remove \$CATALYST_USE"
sed -i "/CATALYST_USE/d" ${clist_make_conf}
if [ -n "${clst_portage_prefix}" ]; then
- rm -R "${clst_chroot_path}/etc/portage/${clst_portage_prefix}"
+ echo "Clear
${clst_chroot_path}/etc/portage/package.keywords/${clst_portage_prefix}"
+ rm -R
"${clst_chroot_path}/etc/portage/package.keywords/${clst_portage_prefix}"
+ echo "Clear
${clst_chroot_path}/etc/portage/package.mask/${clst_portage_prefix}"
+ rm -R
"${clst_chroot_path}/etc/portage/package.mask/${clst_portage_prefix}"
+ echo "Clear
${clst_chroot_path}/etc/portage/package.unmask/${clst_portage_prefix}"
+ rm -R
"${clst_chroot_path}/etc/portage/package.unmask/${clst_portage_prefix}"
+ echo "Clear
${clst_chroot_path}/etc/portage/package.use/${clst_portage_prefix}"
+ rm -R
"${clst_chroot_path}/etc/portage/package.use/${clst_portage_prefix}"
fi
}
[gentoo-commits] proj/catalyst:catalyst_use commit in: catalyst/base/
commit: fd8783cbb805d5eb647ace3380d0b6e15b659003 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Wed Mar 1 03:42:19 2017 + Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Wed Mar 1 03:42:19 2017 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fd8783cb Fix break caused by a space inside a string instead of outside. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 9a36fd3..f0b62d7 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -522,7 +522,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_action_sequence(self): """Set basic stage1, 2, 3 action sequences""" - self.settings["action_sequence"] = ["unpack"," unpack_snapshot", + self.settings["action_sequence"] = ["unpack", "unpack_snapshot", "setup_confdir", "portage_overlay", "base_dirs", "bind", "chroot_setup", "setup_environment", "run_local", "preclean", "unbind", "clean"]
[gentoo-commits] proj/catalyst:catalyst_use commit in: catalyst/base/
commit: f61ad05ca3539de7454b22c602cb6f30b6ea8f87
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Mon Feb 6 03:35:34 2017 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Feb 6 03:36:29 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f61ad05c
stagebase.py: Whitespace cleanups
Add spaces around '=', after ','
Some long line cleanup.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)
gentoo.org>
catalyst/base/stagebase.py | 540 +++--
1 file changed, 274 insertions(+), 266 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 2fd8925..9a36fd3 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -32,15 +32,15 @@ class StageBase(TargetBase, ClearBase, GenBase):
the driver class for pretty much everything that Catalyst does.
"""
def __init__(self,myspec,addlargs):
-
self.required_values.extend(["version_stamp","target","subarch",\
- "rel_type","profile","snapshot","source_subpath"])
-
- self.valid_values.extend(["version_stamp","target","subarch",
- "rel_type","profile","snapshot","source_subpath",
- "portage_confdir","portage_prefix","portage_overlay",
-
"cflags","cxxflags","fcflags","fflags","ldflags","asflags",
- "cbuild","hostuse","catalyst_use",
-
"distcc_hosts","makeopts","pkgcache_path","kerncache_path",
+ self.required_values.extend(["version_stamp", "target",
"subarch",
+ "rel_type", "profile", "snapshot", "source_subpath"])
+
+ self.valid_values.extend(["version_stamp", "target", "subarch",
+ "rel_type", "profile", "snapshot", "source_subpath",
+ "portage_confdir", "portage_prefix", "portage_overlay",
+ "cflags", "cxxflags", "fcflags", "fflags", "ldflags",
"asflags",
+ "cbuild", "hostuse", "catalyst_use",
+ "distcc_hosts", "makeopts", "pkgcache_path",
"kerncache_path",
"compression_mode", "decompression_mode"])
self.set_valid_build_kernel_vars(addlargs)
@@ -75,16 +75,18 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.subarchmap = {}
machinemap = {}
arch_dir = self.settings["archdir"] + "/"
- for x in [x[:-3] for x in os.listdir(arch_dir) if
x.endswith(".py") and x != "__init__.py"]:
+ for x in [
+ x[:-3] for x in os.listdir(arch_dir) if
x.endswith(".py")
+ and x != "__init__.py"]:
log.debug("Begin loading arch modules...")
try:
- fh=open(arch_dir + x + ".py")
- # This next line loads the plugin as a module
and assigns it to
- # archmap[x]
- self.archmap[x]=imp.load_module(x,fh, arch_dir
+ x + ".py",
+ fh = open(arch_dir + x + ".py")
+ # This next line loads the plugin as a module
and
+ # assigns it to archmap[x]
+ self.archmap[x] = imp.load_module(x, fh,
arch_dir + x + ".py",
(".py", "r", imp.PY_SOURCE))
- # This next line registers all the subarches
supported in the
- # plugin
+ # This next line registers all the subarches
+ # supported in the plugin
tmpsubarchmap, tmpmachinemap =
self.archmap[x].register()
self.subarchmap.update(tmpsubarchmap)
for machine in tmpmachinemap:
@@ -102,26 +104,26 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "chost" in self.settings:
hostmachine = self.settings["chost"].split("-")[0]
if hostmachine not in machinemap:
- raise CatalystError("Unknown host machine type
"+hostmachine)
- self.settings["hostarch"]=machinemap[hostmachine]
+ raise CatalystError("Unknown host machine type
" + hostmachine)
+ self.settings["hostarch"] = machinemap[hostmachine]
else:
hostmachine = self.settings["subarch"]
if hostmachine in machinemap:
hostmachine = machinemap[hostmachine]
- self.settings["hostarch"]=hostmachine
+
