[gentoo-commits] proj/catalyst:catalyst_use commit in: targets/support/

[gentoo-commits] proj/catalyst:catalyst_use commit in: targets/support/

[Brian Dolbec]

commit:     ed0c8093f9867b91b870cddaad9a16800ea13f3c
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 17:12:12 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 17:12:12 2017 +0000
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/

[Jorge Manuel B. S. Vicetto]

commit:     b970ce471080706fd1345a547ab8f83e2a005ebb
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 00:23:59 2017 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 00:23:59 2017 +0000
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/

[Jorge Manuel B. S. Vicetto]

commit:     842861ff4a10997580794bdfe15e1ec4051574e1
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  4 17:01:06 2017 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr  4 17:01:06 2017 +0000
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) <jmbsvicetto <AT> 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} ] &&