[gentoo-commits] proj/catalyst:catalyst_use commit in: targets/support/
commit: 842861ff4a10997580794bdfe15e1ec4051574e1
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Tue Apr 4 17:01:06 2017 +
Commit: Jorge Manuel B. S. Vicetto gentoo org>
CommitDate: Tue Apr 4 17:01:06 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=842861ff
Fix typo and remove ',' from parameter list.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)
gentoo.org>
targets/support/functions.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index f743d419..b330ce25 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -27,10 +27,10 @@ clear_portage() {
[ -e ${clst_chroot_path}${clst_make_conf} ] && echo "Drop
\$CATALYST_USE from USE on ${clst_chroot_path}${clst_make_conf}"
[ -e ${clst_chroot_path}${clst_make_conf} ] && sed -i -e
"/^USE=\"/s/\${CATALYST_USE} //" ${clst_chroot_path}${clst_make_conf}
[ -e ${clst_chroot_path}${clst_make_conf} ] && echo "Remove
\$CATALYST_USE on ${clst_chroot_path}${clst_make_conf}"
- [ -e ${clst_chroot_path}${clst_make_conf} ] && sed -i -e
"/^CATALYST_USE/d" ${clst_chroot_path}${clist_make_conf}
+ [ -e ${clst_chroot_path}${clst_make_conf} ] && sed -i -e
"/^CATALYST_USE/d" ${clst_chroot_path}${clst_make_conf}
if [ -n "${clst_portage_prefix}" ]; then
- for dir in "keywords", "mask", "unmask", "use"; do
+ for dir in "keywords" "mask" "unmask" "use"; do
[ -d
${clst_chroot_path}/etc/portage/package.${dir}/${clst_portage_prefix} ] &&
echo "Clear
${clst_chroot_path}/etc/portage/package.${dir}/${clst_portage_prefix}"
[ -d
${clst_chroot_path}/etc/portage/package.${dir}/${clst_portage_prefix} ] &&
[gentoo-commits] proj/catalyst:catalyst_use commit in: targets/support/, targets/stage2/, targets/stage3/, targets/stage4/
commit: b2ac96efc3d787ec33f11a0a5eeaa10d67b5556a
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Sat Mar 11 00:43:29 2017 +
Commit: Jorge Manuel B. S. Vicetto gentoo org>
CommitDate: Sat Mar 11 00:43:29 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2ac96ef
Add prepare_portage and clear_portage to functions.sh and to the controller.sh
file for stages 2, 3 and 4.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)
gentoo.org>
targets/stage2/stage2-controller.sh | 3 +++
targets/stage3/stage3-controller.sh | 3 +++
targets/stage4/stage4-controller.sh | 3 +++
targets/support/functions.sh| 23 +++
4 files changed, 32 insertions(+)
diff --git a/targets/stage2/stage2-controller.sh
b/targets/stage2/stage2-controller.sh
index 25e5120..41bd43b 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -10,6 +10,8 @@ case $1 in
;;
run)
+ prepare_portage
+
shift
export clst_packages="$*"
exec_in_chroot \
@@ -17,6 +19,7 @@ case $1 in
;;
preclean)
+ clear_portage
exec_in_chroot
${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
diff --git a/targets/stage3/stage3-controller.sh
b/targets/stage3/stage3-controller.sh
index df1479e..eaa40b3 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -10,12 +10,15 @@ case $1 in
;;
run)
+ prepare_portage
+
shift
export clst_packages="$*"
exec_in_chroot
${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
+ clear_portage
exec_in_chroot
${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
diff --git a/targets/stage4/stage4-controller.sh
b/targets/stage4/stage4-controller.sh
index d42f302..4c5d5a0 100755
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -10,6 +10,8 @@ case $1 in
;;
pre-kmerge)
+ prepare_portage
+
# Sets up the build environment before any kernels are compiled
exec_in_chroot ${clst_shdir}/support/pre-kmerge.sh
;;
@@ -41,6 +43,7 @@ case $1 in
;;
preclean)
+ clear_portage
exec_in_chroot
${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
;;
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index cca2fd8..f743d41 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -16,6 +16,29 @@ delete_from_chroot(){
fi
}
+prepare_portage() {
+
+ echo "CATALYST_USE=\"${clst_CATALYST_USE}\"" >>
${clst_chroot_path}${clst_make_conf}
+ sed -i -e "/^USE=\"/s//\${CATALYST_USE} ${USE} /"
${clst_chroot_path}${clst_make_conf}
+}
+
+clear_portage() {
+ # Clean-up USE again
+ [ -e ${clst_chroot_path}${clst_make_conf} ] && echo "Drop
\$CATALYST_USE from USE on ${clst_chroot_path}${clst_make_conf}"
+ [ -e ${clst_chroot_path}${clst_make_conf} ] && sed -i -e
"/^USE=\"/s/\${CATALYST_USE} //" ${clst_chroot_path}${clst_make_conf}
+ [ -e ${clst_chroot_path}${clst_make_conf} ] && echo "Remove
\$CATALYST_USE on ${clst_chroot_path}${clst_make_conf}"
+ [ -e ${clst_chroot_path}${clst_make_conf} ] && sed -i -e
"/^CATALYST_USE/d" ${clst_chroot_path}${clist_make_conf}
+
+ if [ -n "${clst_portage_prefix}" ]; then
+ for dir in "keywords", "mask", "unmask", "use"; do
+ [ -d
${clst_chroot_path}/etc/portage/package.${dir}/${clst_portage_prefix} ] &&
+ echo "Clear
${clst_chroot_path}/etc/portage/package.${dir}/${clst_portage_prefix}"
+ [ -d
${clst_chroot_path}/etc/portage/package.${dir}/${clst_portage_prefix} ] &&
+ rm -R
"${clst_chroot_path}/etc/portage/package.${dir}/${clst_portage_prefix}"
+ done
+ fi
+}
+
exec_in_chroot(){
# Takes the full path to the source file as its argument
# copies the file to the /tmp directory of the chroot
[gentoo-commits] proj/catalyst:catalyst_use commit in: targets/support/
commit: b970ce471080706fd1345a547ab8f83e2a005ebb
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Sat Mar 11 00:23:59 2017 +
Commit: Jorge Manuel B. S. Vicetto gentoo org>
CommitDate: Sat Mar 11 00:23:59 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b970ce47
Revert "targets/support/kmerge.sh: Add loglevel option to genkernel command"
This reverts commit ed0c8093f9867b91b870cddaad9a16800ea13f3c.
targets/support/kmerge.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 3c64e47..fc066cc 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -11,7 +11,6 @@ setup_gk_args() {
# default genkernel args
GK_ARGS="${clst_gk_mainargs} \
${clst_kernel_gk_kernargs} \
---loglevel=5 \
--cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp} \
--no-mountboot \
--kerneldir=/usr/src/linux \
[gentoo-commits] proj/catalyst:catalyst_use commit in: targets/support/
commit: ed0c8093f9867b91b870cddaad9a16800ea13f3c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Tue Mar 7 17:12:12 2017 +
Commit: Brian Dolbec gentoo org>
CommitDate: Tue Mar 7 17:12:12 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ed0c8093
targets/support/kmerge.sh: Add loglevel option to genkernel command
targets/support/kmerge.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index fc066cc..3c64e47 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -11,6 +11,7 @@ setup_gk_args() {
# default genkernel args
GK_ARGS="${clst_gk_mainargs} \
${clst_kernel_gk_kernargs} \
+--loglevel=5 \
--cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp} \
--no-mountboot \
--kerneldir=/usr/src/linux \
[gentoo-commits] proj/catalyst:catalyst_use commit in: targets/support/, targets/stage2/, targets/stage1/, catalyst/base/, ...
commit: eef609335a51e9a04038e91a34ee694a866ec2ca
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo
org>
AuthorDate: Sat Feb 4 21:43:01 2017 +
Commit: Brian Dolbec gentoo org>
CommitDate: Mon Feb 6 02:12:02 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=eef60933
Add initial support for portage_prefix.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)
gentoo.org>
catalyst/base/stagebase.py | 10 --
targets/stage1/stage1-controller.sh | 3 +++
targets/stage2/stage2-controller.sh | 3 +++
targets/stage3/stage3-controller.sh | 3 +++
targets/support/functions.sh| 16
5 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 8d00fa1..2fd8925 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -36,8 +36,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
"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",
+ "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"])
@@ -601,6 +603,10 @@ 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/stage1/stage1-controller.sh
b/targets/stage1/stage1-controller.sh
index ac813de..798d679 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -16,6 +16,8 @@ case "$1" in
# Setup make.conf and make.profile link in "ROOT in chroot":
copy_to_chroot "${clst_chroot_path}${clst_make_conf}"
"${clst_root_path}${clst_port_conf}"
+ prepare_portage
+
# Enter chroot, execute our build script
exec_in_chroot \
"${clst_shdir}/${clst_target}/${clst_target}-chroot.sh"
\
@@ -23,6 +25,7 @@ case "$1" in
;;
preclean)
+ clear_portage
exec_in_chroot
"${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh" || exit 1
;;
diff --git a/targets/stage2/stage2-controller.sh
b/targets/stage2/stage2-controller.sh
index 25e5120..41bd43b 100755
--- a/targets/stage2/stage2-controller.sh
+++ b/targets/stage2/stage2-controller.sh
@@ -10,6 +10,8 @@ case $1 in
;;
run)
+ prepare_portage
+
shift
export clst_packages="$*"
exec_in_chroot \
@@ -17,6 +19,7 @@ case $1 in
;;
preclean)
+ clear_portage
exec_in_chroot
${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
diff --git a/targets/stage3/stage3-controller.sh
b/targets/stage3/stage3-controller.sh
index df1479e..eaa40b3 100755
--- a/targets/stage3/stage3-controller.sh
+++ b/targets/stage3/stage3-controller.sh
@@ -10,12 +10,15 @@ case $1 in
;;
run)
+ prepare_portage
+
shift
export clst_packages="$*"
exec_in_chroot
${clst_shdir}/${clst_target}/${clst_target}-chroot.sh
;;
preclean)
+ clear_portage
exec_in_chroot
${clst_shdir}/${clst_target}/${clst_target}-preclean-chroot.sh
;;
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index cca2fd8..eded8b7 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -16,6 +16,22 @@ delete_from_chroot(){
fi
}
+prepare_portage() {
+
+ echo "CATALYST_USE=\"${clst_CATALYST_USE}\"" >> ${clst_make_conf}
+ sed -i -e "/USE=\"/s/\${CATALYST_USE} " ${clst_make_conf}
+}
+
+clear_portage() {
+ # Clean-up USE again
+ sed -i "/USE=\"/s/\${CATALYST_USE} //" ${clst_make_conf}
+ sed -i "/CATALYST_USE/d" ${clist_make_conf}
+
+ if [ -n
