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

2017-11-22 Thread Brian Dolbec 
commit: 0f17e92e40d41c54af7bc863f033f1fdc61f9bf3
Author: Ben Kohler  gmail  com>
AuthorDate: Thu Oct 12 16:33:27 2017 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Oct 12 19:39:22 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0f17e92e

rc-update.sh: fix rc-update calls to work inside chroot

When "rc-update del service" is called without a runlevel specified, it
removes the service from the current runlevel which may or may not be
correct within the chroot.  This commit adds --all to ensure that these
rc-update calls actually take effect.

 targets/support/rc-update.sh | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index c3e8ed9c..f2de50e0 100755
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -11,12 +11,11 @@ fi
 
 if [ "${clst_spec_prefix}" == "livecd" ]
 then
-   # default programs that we always want to start
-   rc-update del iptables
-   rc-update del netmount
-   rc-update del keymaps
-   rc-update del serial
-   rc-update del consolefont
+   rc-update --all del iptables
+   rc-update --all del netmount
+   rc-update --all del keymaps
+   rc-update --all del serial
+   rc-update --all del consolefont
# We need to add this one, unconditionally
rc-update add autoconfig default
[[ -e /etc/init.d/splash ]] && rc-update add splash default

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

2017-03-16 Thread Brian Dolbec 
commit: bdd15f9425bc1aa45d1ed3a8afb57cd751ea0d9c
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sat Mar 11 21:53:42 2017 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Mar 11 21:54:00 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bdd15f94

stage1: run bootstrap w/--verbose

 targets/support/chroot-functions.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2f79492..b01 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -139,6 +139,7 @@ setup_myemergeopts(){
if [[ "${clst_VERBOSE}" == "true" ]]
then
clst_myemergeopts="--verbose"
+   bootstrap_opts="${bootstrap_opts} -v"
else
clst_myemergeopts="--quiet"
bootstrap_opts="${bootstrap_opts} -q"

[gentoo-commits] proj/catalyst:pending commit in: targets/support/, targets/stage2/, targets/stage3/, targets/stage4/

2017-03-11 Thread Brian Dolbec 
commit: 02d35cf3b15cace8ac81922d0d09764051cabbd4
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto)  gentoo 
 org>
AuthorDate: Sat Mar 11 00:43:29 2017 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sat Mar 11 09:01:06 2017 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=02d35cf3

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:pending commit in: targets/support/, targets/stage1/

2015-09-06 Thread Brian Dolbec 
commit: 6d795daf6d86779b17206f8a558bfcac44822a6b
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 16:49:55 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 16:49:55 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6d795daf

handle clst_BINDIST properly in stage1

revert 306d797509244bf3508def0aa6c1bbcdfb6e1257 and avoid double setting
bindist during stage1 (cleanliness)

 targets/stage1/stage1-chroot.sh | 3 ++-
 targets/support/chroot-functions.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 91ab1fa..f77bd9f 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -6,7 +6,8 @@ source /tmp/chroot-functions.sh
 export clst_buildpkgs="$(/tmp/build.py)"
 
 # Setup our environment
-BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
+[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
 
 FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2986ae7..91a2b5f 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -167,7 +167,8 @@ setup_gcc(){
 
 setup_pkgmgr(){
# Set bindist USE flag if clst_BINDIST is set
-   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+   [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \
+   && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" 
>> "${clst_make_conf}"
 
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could

[gentoo-commits] proj/catalyst:pending commit in: targets/support/, catalyst/base/

2015-09-03 Thread Brian Dolbec 
commit: cec4889344a5c5de7fa02ade0253808dc73f3008
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep  2 21:22:38 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep  2 21:22:38 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cec48893

Revert "fix minor typo"

This reverts commit da114f314109977bca344179ed7c3aa648837afd.

bad commit

 catalyst/base/stagebase.py  | 2 +-
 targets/support/chroot-functions.sh | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 23491aa..c0bafc2 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
 
if myusevars:
-   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# building in addition to what is provided by the 
profile.\n")
+   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# buidling in addition to what is provided by the 
profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5dd542e..5e046cb 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,9 +166,6 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
-   # Set bindist USE flag if clst_BINDIST is set
-   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
@@ -271,6 +268,9 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
 
+   # Set bindist USE flag if clst_BINDIST is set
+   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,6 +287,9 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
 
emerge ${clst_myemergeopts} $@ || exit 1
+
+   # Clean-up USE again
+   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

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

2015-09-03 Thread Brian Dolbec 
commit: 9bdb0512140496d53f97f7ef4592921306056d6b
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep  2 21:25:24 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep  2 21:25:24 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9bdb0512

shuffle where bindist is being set

set USE=bindist in setup_pkgmgr and remove it in cleanup_stage

 targets/support/chroot-functions.sh | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5e046cb..b8ab8d2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,6 +166,9 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
+   # Set bindist USE flag if clst_BINDIST is set
+   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
@@ -228,6 +231,9 @@ cleanup_stages() {
;;
esac
 
+   # Remove bindist from use
+   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
+
rm -f /var/log/emerge.log /var/log/portage/elog/*
 }
 
@@ -268,9 +274,6 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
 
-   # Set bindist USE flag if clst_BINDIST is set
-   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,9 +290,6 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
 
emerge ${clst_myemergeopts} $@ || exit 1
-
-   # Clean-up USE again
-   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

[gentoo-commits] proj/catalyst:pending commit in: targets/support/, catalyst/base/

2015-09-03 Thread Brian Dolbec 
commit: da114f314109977bca344179ed7c3aa648837afd
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep  2 21:22:01 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep  2 21:22:01 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=da114f31

fix minor typo

 catalyst/base/stagebase.py  | 2 +-
 targets/support/chroot-functions.sh | 9 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index c0bafc2..23491aa 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
 
if myusevars:
-   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# buidling in addition to what is provided by the 
profile.\n")
+   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# building in addition to what is provided by the 
profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5e046cb..5dd542e 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,6 +166,9 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
+   # Set bindist USE flag if clst_BINDIST is set
+   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
@@ -268,9 +271,6 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
 
-   # Set bindist USE flag if clst_BINDIST is set
-   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,9 +287,6 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
 
emerge ${clst_myemergeopts} $@ || exit 1
-
-   # Clean-up USE again
-   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

[gentoo-commits] proj/catalyst:pending commit in: targets/support/, targets/stage4/

2015-09-03 Thread Brian Dolbec 
commit: e8ee4a518a2dc48d845e2f6bd09e0ce2cc62996e
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 01:46:06 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 01:46:06 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e8ee4a51

use the cleanup_stage function instead of manual cleanup for stage4, do not 
wipe log directories for tinderbox

 targets/stage4/stage4-preclean-chroot.sh | 10 +-
 targets/support/chroot-functions.sh  |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/targets/stage4/stage4-preclean-chroot.sh 
b/targets/stage4/stage4-preclean-chroot.sh
index 8f2e894..a22b6c1 100755
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -7,12 +7,4 @@ source /tmp/chroot-functions.sh
 update_env_settings
 show_debug
 
-if [ -n "${clst_DISTCC}" ]
-then
-   cleanup_distcc
-fi
-
-if [ -n "${clst_ICECREAM}" ]
-then
-   cleanup_icecream
-fi
+cleanup_stages

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index b8ab8d2..2986ae7 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 
-   rm -f /var/log/emerge.log /var/log/portage/elog/*
+   [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log 
/var/log/portage/elog/*
 }
 
 update_env_settings(){

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

2015-09-03 Thread Brian Dolbec 
commit: 44919839b30fff5176e5c261340baf6af173c033
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 01:47:28 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 01:47:28 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=44919839

scratch that, tinderbox does not run cleanup

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2986ae7..b8ab8d2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 
-   [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log 
/var/log/portage/elog/*
+   rm -f /var/log/emerge.log /var/log/portage/elog/*
 }
 
 update_env_settings(){

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

2015-08-31 Thread Brian Dolbec 
commit: 41cf287b363718c124bd70a8ca8eee715f757206
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Mon Aug 31 20:07:32 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon Aug 31 20:07:32 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=41cf287b

by request, keep consistant double quotes; fixing sed removal of bindist in 
chroot-functions.sh

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 9066642..5e046cb 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -289,7 +289,7 @@ run_merge() {
emerge ${clst_myemergeopts} $@ || exit 1
 
# Clean-up USE again
-   sed -i '/USE="${USE} bindist"/d' "${clst_make_conf}"
+   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

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

2015-08-31 Thread Brian Dolbec 
commit: b2473eff92e64a13f87c1ba3c0628e3a7a75b5a3
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Mon Aug 31 03:45:31 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon Aug 31 03:45:31 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2473eff

USE=${USE} gets parsed in bash instead of in make.conf, \${USE} prevents the 
expansion until it is already inside make.conf

 targets/support/chroot-functions.sh | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 253eee2..4506eef 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -172,12 +172,12 @@ setup_pkgmgr(){
# Use --update or portage might just waste time/cycles and reinstall 
the same version.
# Use --newuse to make sure it rebuilds with any changed use flags.
if [ -n "$1" ];then
-   echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
-   [ -e "${clst_make_conf}" ] && echo "USE=\"${USE} $1\"" >> 
"${clst_make_conf}"
+   echo "Adding USE=\"\${USE} $1\" to make.conf for portage build"
+   [ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> 
"${clst_make_conf}"
run_merge --oneshot --update --newuse sys-apps/portage
-   sed -i "/USE=\"${USE} $1\"/d" "${clst_make_conf}"
+   sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
else
-   echo "Updating portage with USE=\"${USE}\""
+   echo "Updating portage with USE=\"\${USE}\""
run_merge --oneshot --update --newuse sys-apps/portage
fi
 }
@@ -270,7 +270,7 @@ run_merge() {
export CONFIG_PROTECT="-*"
 
# Set bindist USE flag if clst_BINDIST is set
-   [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"${USE} bindist\"" >> ${clst_make_conf}
+   [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> ${clst_make_conf}
 
if [ -n "${clst_VERBOSE}" ]
then

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

2015-08-31 Thread Brian Dolbec 
commit: 682265b917afaffcce30026fca6c72f795177dc6
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Mon Aug 31 04:03:48 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon Aug 31 04:03:48 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=682265b9

remove pointless USE=${USE} message

 targets/support/chroot-functions.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 4506eef..14a2e35 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -177,7 +177,6 @@ setup_pkgmgr(){
run_merge --oneshot --update --newuse sys-apps/portage
sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
else
-   echo "Updating portage with USE=\"\${USE}\""
run_merge --oneshot --update --newuse sys-apps/portage
fi
 }

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

2015-08-31 Thread Brian Dolbec 
commit: 487f1e94217c6a64b770a3f32d942eb613159be0
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Mon Aug 31 03:36:04 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon Aug 31 03:36:04 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=487f1e94

fix USE="$USE $1" showing up in make.conf

 targets/support/chroot-functions.sh | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 95904b3..253eee2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -172,12 +172,12 @@ setup_pkgmgr(){
# Use --update or portage might just waste time/cycles and reinstall 
the same version.
# Use --newuse to make sure it rebuilds with any changed use flags.
if [ -n "$1" ];then
-   echo "Adding USE='${USE} $1' to make.conf for portage build"
-   [ -e ${clst_make_conf} ] && echo 'USE="${USE} $1"' >> 
${clst_make_conf}
+   echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
+   [ -e "${clst_make_conf}" ] && echo "USE=\"${USE} $1\"" >> 
"${clst_make_conf}"
run_merge --oneshot --update --newuse sys-apps/portage
-   sed -i '/USE="${USE} $1"/d' ${clst_make_conf}
+   sed -i "/USE=\"${USE} $1\"/d" "${clst_make_conf}"
else
-   echo "Updating portage with USE='${USE}'"
+   echo "Updating portage with USE=\"${USE}\""
run_merge --oneshot --update --newuse sys-apps/portage
fi
 }

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

2015-08-31 Thread Brian Dolbec 
commit: f59ab2fc422dd6c8c2a07c4a89d3fae3f6aa2c69
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Mon Aug 31 17:55:57 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Mon Aug 31 17:55:57 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f59ab2fc

safer quoting for clst_make_conf and proper quoting for "USE=${USE} bindist"

prevent possible issues with spaces in $clst_make_conf

prevent ${USE} being expanded by bash and causing the sed removal of
USE="${USE} bindist"
to fail

 targets/support/chroot-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 14a2e35..9066642 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -269,7 +269,7 @@ run_merge() {
export CONFIG_PROTECT="-*"
 
# Set bindist USE flag if clst_BINDIST is set
-   [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> ${clst_make_conf}
+   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
 
if [ -n "${clst_VERBOSE}" ]
then
@@ -289,7 +289,7 @@ run_merge() {
emerge ${clst_myemergeopts} $@ || exit 1
 
# Clean-up USE again
-   sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf}
+   sed -i '/USE="${USE} bindist"/d' "${clst_make_conf}"
 }
 
 show_debug() {

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

2015-05-21 Thread Brian Dolbec 
commit: 61c2dff4545ebf5dac0099e9c598cb2ab2f352b3
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:40:05 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:04 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=61c2dff4

Use the system's iplboot to be sure it matches palo's version.

For hppa, cdtar is a bad idea because the iplboot version in the tar file
might not match palo's version.

 targets/support/bootloader-setup.sh | 5 +
 1 file changed, 5 insertions(+)

diff --git a/targets/support/bootloader-setup.sh 
b/targets/support/bootloader-setup.sh
index b76b5c4..d9e2620 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -41,6 +41,8 @@ case ${clst_hostarch} in
;;
hppa)
# NO SOFTLEVEL SUPPORT YET
+   mkdir -p $1/boot
+
icfg=$1/boot/palo.conf
kmsg=$1/boot/kernels.msg
hmsg=$1/boot/help.msg
@@ -54,6 +56,9 @@ case ${clst_hostarch} in
my_kopts="${my_kopts} ${kopts}"
done
 
+   # copy the bootloader for the final image
+   cp /usr/share/palo/iplboot $1/boot/
+
echo "--commandline=0/${boot_kernel_common_name} 
initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
echo "--bootloader=boot/iplboot" >> ${icfg}
echo "--ramdisk=boot/${first}.igz" >> ${icfg}

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

2015-05-21 Thread Brian Dolbec 
commit: 23cd0ed7dc8ab4483bd34810d52309e90de5723a
Author: Guy Martin  gentoo  org>
AuthorDate: Sun Apr 20 13:21:21 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:05 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=23cd0ed7

netboot2.sh: Fix missing slashes in paths

 targets/support/netboot2-final.sh | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/targets/support/netboot2-final.sh 
b/targets/support/netboot2-final.sh
index 94b86e1..ebd5187 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -4,20 +4,20 @@ source ${clst_shdir}/support/functions.sh
 source ${clst_shdir}/support/filesystem-functions.sh
 
 
-extract_kernels ${clst_target_path}boot
+extract_kernels ${clst_target_path}/boot
 
-# Move kernel binaries to ${clst_target_path}kernels, and
-# move everything else to ${clst_target_path}kernels/misc
-mkdir ${clst_target_path}kernels
-mkdir ${clst_target_path}kernels/misc
+# Move kernel binaries to ${clst_target_path}/kernels, and
+# move everything else to ${clst_target_path}/kernels/misc
+mkdir ${clst_target_path}/kernels
+mkdir ${clst_target_path}/kernels/misc
 
 for x in ${clst_boot_kernel}; do
-   mv ${clst_target_path}boot/${x} ${clst_target_path}kernels
-   mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc
-   mv ${clst_target_path}boot/System.map* 
${clst_target_path}kernels/misc/System.map-${x}
+   mv ${clst_target_path}/boot/${x} ${clst_target_path}/kernels
+   mv ${clst_target_path}/boot/${x}.igz ${clst_target_path}/kernels/misc
+   mv ${clst_target_path}/boot/System-${x}.map 
${clst_target_path}/kernels/misc
 done
 
-rmdir ${clst_target_path}boot
+rmdir ${clst_target_path}/boot
 
 # Any post-processing necessary for each architecture can be done here.  This
 # may include things like sparc's elftoaout, x86's PXE boot, etc.
@@ -51,7 +51,7 @@ case ${clst_hostarch} in
fi
for x in ${clst_boot_kernel}; do
elftoaout ${clst_target_path}/kernels/${x} -o 
${clst_target_path}/${x}-a.out
-   ${piggyback} ${clst_target_path}/${x}-a.out 
${clst_target_path}/kernels/misc/System-${x}.map 
${clst_target_path}/kernels/misc/${x}.igz
+   ${piggyback} ${clst_target_path}/${x}-a.out 
${clst_target_path}/kernels/misc/System.map-${x} 
${clst_target_path}/kernels/misc/${x}.igz
done
;;
ia64)

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

2015-05-21 Thread Brian Dolbec 
commit: 0343a18ec34a9d9ef03d917afb5d24cd908752b5
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:39:59 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:04 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0343a18e

Fix merging kernel without kerncache enabled.

This is the proper fix for building kernels without kerncache.
It prevents the creation of kerncache specific files and does not check for 
them.
Build with kerncache require the later patch to work.

 targets/support/kmerge.sh | 111 +-
 1 file changed, 60 insertions(+), 51 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 8e832e1..100c6ef 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -109,7 +109,7 @@ genkernel_compile(){
else
genkernel ${GK_ARGS} || exit 1
fi
-   if [ -e /var/tmp/${clst_kname}.config ]
+   if [ -n "${clst_KERNCACHE}" -a -e /var/tmp/${clst_kname}.config ]
then
md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \

/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
@@ -144,63 +144,58 @@ fi
 # USE variables (and thus different patches enabled/disabled.) Also, there's no
 # real benefit in using the pkgcache for kernel source ebuilds.
 
-USE_MATCH=0
-if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ]
+
+# Check if we have a match in kerncach
+
+if [ -n "${clst_KERNCACHE}" ]
 then
-   STR1=$(for i in `cat 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo 
$i; done|sort)
-   STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort)
-   if [ "${STR1}" = "${STR2}" ]
+
+   USE_MATCH=0
+   if [ -e 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ]
then
-   #echo "USE Flags match"
-   USE_MATCH=1
-   else
-   if [ -n "${clst_KERNCACHE}" ]
+   STR1=$(for i in `cat 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo 
$i; done|sort)
+   STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort)
+   if [ "${STR1}" = "${STR2}" ]
then
-   [ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \
-   rm -r /tmp/kerncache/${clst_kname}/ebuilds
-   [ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \
-   rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config
+   #echo "USE Flags match"
+   USE_MATCH=1
+   else
+   [ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \
+   rm -r /tmp/kerncache/${clst_kname}/ebuilds
+   [ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config 
] && \
+   rm 
/tmp/kerncache/${clst_kname}/usr/src/linux/.config
fi
fi
-fi
 
-EXTRAVERSION_MATCH=0
-if [ -e 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ]
-then
-   STR1=`cat 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION`
-   STR2=${clst_kextraversion}
-   if [ "${STR1}" = "${STR2}" ]
+   EXTRAVERSION_MATCH=0
+   if [ -e 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ]
then
-   if [ -n "${clst_KERNCACHE}" ]
+   STR1=`cat 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION`
+   STR2=${clst_kextraversion}
+   if [ "${STR1}" = "${STR2}" ]
then
#echo "EXTRAVERSION match"
EXTRAVERSION_MATCH=1
fi
fi
-fi
 
-CONFIG_MATCH=0
-if [ -n "${clst_KERNCACHE}" -a \
- -e 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
-then
-   if [ ! -e /var/tmp/${clst_kname}.config ]
+   CONFIG_MATCH=0
+   if [ -e 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
then
-   CONFIG_MATCH=1
-   else
-   STR1=`cat 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
-   STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
-   if [ "${STR1}" = "${STR2}" ]
+   if [ ! -e /var/tmp/${clst_kname}.config ]
then
CONFIG_MATCH=1
+   else
+   STR1=`cat 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
+   STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print 
$1}'`
+   if [ "${STR1}" = "${STR2}" ]
+   then
+   CONFIG_MATCH=1
+   fi

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

2015-05-21 Thread Brian Dolbec 
commit: 100f238eedc1a34c4fa5a3f15b07482d06f4f391
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:39:57 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:03 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=100f238e

depscan.sh doesn't exists anymore.

 targets/support/post-kmerge.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
index c17680c..58b2e08 100755
--- a/targets/support/post-kmerge.sh
+++ b/targets/support/post-kmerge.sh
@@ -7,6 +7,5 @@ source /tmp/chroot-functions.sh
 # Only run depscan.sh if modules exist
 if [ -n "$(ls /lib/modules)" ]
 then
-   /sbin/depscan.sh
find /lib/modules -name modules.dep -exec touch {} \;
 fi

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

2015-05-21 Thread Brian Dolbec 
commit: fed3b45bb608d2022fbc253aff836397c5801cb7
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:40:03 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:04 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fed3b45b

Fix and improve kernel build when kerncache is enabled.

This patch gets rid of setting ROOT for merging kernel sources. Instead, the
sources are moved manually to the kerncache directory. A new file is created
containing the kernel version and it is fed into package.provided to prevent
merging the kernel sources again.
Brian Dolbec: fix whitespace error.

 targets/support/kmerge.sh | 39 ++-
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 100c6ef..03869c3 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -197,9 +197,17 @@ then
 
# Create the kerncache directory if it doesn't exists
mkdir -p /tmp/kerncache/${clst_kname}
-   clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} 
clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || 
exit 1
-   KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
-   if [ ! -e /etc/portage/profile/package.provided ]
+
+   if [ -e 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION ]
+   then
+   
KERNELVERSION=$( 
${clst_port_conf}/profile/package.provided
+   else
+   rm -f ${clst_port_conf}/profile/package.provided
+   fi
+
+   if [ ! -e ${clst_port_conf}/profile/package.provided ]
then
mkdir -p /etc/portage/profile
echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
@@ -209,8 +217,26 @@ then
echo "${KERNELVERSION}" >> 
/etc/portage/profile/package.provided
fi
fi
+
[ -L /usr/src/linux ] && rm -f /usr/src/linux
-   ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
+
+   PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" 
run_merge "${clst_ksource}" || exit 1
+
+   SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
+   if [ -L /usr/src/linux ]
+   then
+
+   # A kernel was merged, move it to $SOURCESDIR
+   [ -e ${SOURCESDIR} ] && rm -Rf ${SOURCESDIR}
+
+   KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
+   echo "${KERNELVERSION}" > 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION
+
+   echo "Moving kernel sources to ${SOURCESDIR} ..."
+   mv `readlink -f /usr/src/linux` ${SOURCESDIR}
+
+   fi
+   ln -sf ${SOURCESDIR} /usr/src/linux
 
# If catalyst has set to a empty string, extraversion wasn't specified 
so we
# skip this part
@@ -259,9 +285,4 @@ unset USE
 if [ -n "${clst_KERNCACHE}" ]
 then
echo ${clst_kernel_use} > 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
-
-   if [ -e ${clst_port_conf}/profile/package.provided ]
-   then
-   sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" 
/etc/portage/profile/package.provided
-   fi
 fi

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

2015-05-21 Thread Brian Dolbec 
commit: df44ba2953bc401de6dbc06b4812f644227e89ef
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:39:58 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:04 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=df44ba29

/etc/conf.d/rc doesn't exists anymore.

 targets/support/livecdfs-update.sh | 6 --
 1 file changed, 6 deletions(-)

diff --git a/targets/support/livecdfs-update.sh 
b/targets/support/livecdfs-update.sh
index a222ace..aeae88c 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -11,12 +11,6 @@ then
/etc/ssh/sshd_config
 fi
 
-# Turn off udev tarball
-sed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc
-
-# Turn off udev coldplugging
-sed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc
-
 # Clean up the time and set to UTC
 rm -rf /etc/localtime
 cp /usr/share/zoneinfo/UTC /etc/localtime

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

2015-05-21 Thread Brian Dolbec 
commit: 15b2b25bb9ace8a5155b493819428d026e621ce7
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:40:04 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:04 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=15b2b25b

Don't make cdtar mandatory.

On hppa, we don't need cdtar.

 targets/support/functions.sh | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index de37c19..f6faa61 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -52,8 +52,12 @@ extract_cdtar() {
# which will normally contains a pre-built binary
# boot-loader/filesystem skeleton for the ISO.
cdtar=${clst_cdtar}
-   [ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"
-   tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar 
${cdtar}"
+   if [ -z "${cdtar}" ]
+   then
+   echo "No cdtar specified. Skipping."
+   else
+   tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract 
cdtar ${cdtar}"
+   fi
 }
 
 extract_kernels() {

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

2015-05-21 Thread Brian Dolbec 
commit: d74ecf9effd6e5b3851ceccf3dadbef908260f2f
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:40:02 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:04 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d74ecf9e

Make use of _kernelopts for hppa.

Since hppa only support one command line for both 32 and 64bit kernel,
we merge both kernelopts in the same line.
This is useful for adding extra arguments like 'panic=30' directly in
the spec file.
Brian Dolbec: fix whitepace error.

 targets/support/bootloader-setup.sh | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh 
b/targets/support/bootloader-setup.sh
index 857ce6f..b76b5c4 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -47,7 +47,14 @@ case ${clst_hostarch} in
# Make sure we strip the extension to the kernel to allow palo 
to choose
boot_kernel_common_name=${first/%32/}
boot_kernel_common_name=${boot_kernel_common_name/%64/}
-   echo "--commandline=0/${boot_kernel_common_name} 
initrd=${first}.igz root=/dev/ram0 init=/linuxrc cdroot ${cmdline_opts}" >> 
${icfg}
+
+   for x in ${clst_boot_kernel}
+   do
+   eval kopts=\$clst_boot_kernel_${x}_kernelopts
+   my_kopts="${my_kopts} ${kopts}"
+   done
+
+   echo "--commandline=0/${boot_kernel_common_name} 
initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
echo "--bootloader=boot/iplboot" >> ${icfg}
echo "--ramdisk=boot/${first}.igz" >> ${icfg}
for x in ${clst_boot_kernel}

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

2015-05-21 Thread Brian Dolbec 
commit: d8549032b9081e86465ce3d1f219d5e1043858f1
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:40:00 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:04 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d8549032

Rename System.map in a way that it won't be matched if multiple kernel are used.

The System.map-version file gets renamed to System.map-${kname}.
This causes some trouble when you have more than one kernel as the file from
the previous kernel will be matched as well. To prevent that, I change
the naming slightly.

 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 9419b2b..de37c19 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -107,9 +107,9 @@ extract_kernels() {
mv ${1}/initramfs-* ${1}/${x}.igz
fi
 
-   if [ -e ${1}/System.map-* ];
+   if [ -e ${1}/System.map-* ]
then
-   mv ${1}/System.map-* ${1}/System.map-${x}
+   mv ${1}/System.map-* ${1}/System-${x}.map
fi
done
 }

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

2015-05-21 Thread Brian Dolbec 
commit: 1c7687f60b557d3221661c1a5e25a3dd286cb569
Author: Guy Martin  gentoo  org>
AuthorDate: Wed Feb  5 10:39:56 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Fri Feb 27 02:03:03 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1c7687f6

update-modules doesn't exists anymore.

 targets/support/kmerge.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index ef3eb2e..8e832e1 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -245,8 +245,6 @@ SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ 
print $3 };'`
 EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION 
=//" -e "s/ //g"`
 clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
 
-/sbin/update-modules --assume-kernel=${clst_fudgeuname}
-
 unset USE
 echo ${clst_kernel_use} > 
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE

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

2015-05-21 Thread Brian Dolbec 
commit: 1e853f359d95c1f3a136184c9b125f9d1b7b9581
Author: Raúl Porcel  gentoo  org>
AuthorDate: Fri Nov 28 11:40:28 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Feb 26 23:36:01 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1e853f35

Fix name of system.map for sparc

 targets/support/netboot2-final.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/netboot2-final.sh 
b/targets/support/netboot2-final.sh
index 3a872a9..94b86e1 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -50,8 +50,8 @@ case ${clst_hostarch} in
piggyback=piggyback64
fi
for x in ${clst_boot_kernel}; do
-   elftoaout ${clst_target_path}/kernels/${x} -o 
${clst_target_path}${x}-a.out
-   ${piggyback} ${clst_target_path}/${x}-a.out 
${clst_target_path}kernels/misc/System-${x}.map 
${clst_target_path}kernels/misc/${x}.igz
+   elftoaout ${clst_target_path}/kernels/${x} -o 
${clst_target_path}/${x}-a.out
+   ${piggyback} ${clst_target_path}/${x}-a.out 
${clst_target_path}/kernels/misc/System-${x}.map 
${clst_target_path}/kernels/misc/${x}.igz
done
;;
ia64)

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

2015-02-26 Thread Brian Dolbec 
commit: 733a4e2104be329020f492780720821138f5cb48
Author: W. Trevor King  tremily  us>
AuthorDate: Sat Mar  2 19:17:01 2013 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Feb 26 19:15:21 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=733a4e21

livecdfs-update.sh: Set XSESSION in /etc/env.d/90xsession

As part of the OpenRC migration, the recommended place for configuring
the default X session moved from /etc/rc.conf to /etc/env.d/90xsession
[1].

[1]: http://www.gentoo.org/doc/en/openrc-migration.xml

---
 targets/support/livecdfs-update.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/targets/support/livecdfs-update.sh 
b/targets/support/livecdfs-update.sh
index 60a9a6f..d16248e 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -170,8 +170,7 @@ fi
 # Setup configured default X Session
 if [ -n "${clst_livecd_xsession}" ]
 then
-   sed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \
-   /etc/rc.conf
+   echo "XSESSION=\"${clst_livecd_xsession}\"" > /etc/env.d/90xsession
 fi
 
 # touch /etc/asound.state

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

2015-02-26 Thread Brian Dolbec 
commit: 131464c86740ee6f6432e63035b02302305a3c2a
Author: W. Trevor King  tremily  us>
AuthorDate: Sun Mar  3 12:58:16 2013 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Feb 26 19:15:20 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=131464c8

livecdfs-update.sh: Fix '/etc/sshd' check for sshd_config tweaks

sshd_config lives in /etc/ssh, not /etc/sshd.  This typo has been
present since the block was introduced by c06264e (Initial import of
Catalyst 2.0.0, 2005-04-04), so it's obviously not a widely used
feature ;).  It might be better to just remove the block entirely.

---
 targets/support/livecdfs-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh 
b/targets/support/livecdfs-update.sh
index b017baf..60a9a6f 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -5,7 +5,7 @@ RUN_DEFAULT_FUNCS="no"
 source /tmp/chroot-functions.sh
 
 # Allow root logins to our CD by default
-if [ -e /etc/sshd/sshd_config ]
+if [ -e /etc/ssh/sshd_config ]
 then
sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
/etc/ssh/sshd_config

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

2015-02-26 Thread Brian Dolbec 
commit: 5f837c9d408760a729322b61eba78c3951ffef61
Author: W. Trevor King  tremily  us>
AuthorDate: Fri Mar  8 12:26:16 2013 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Feb 26 19:15:21 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5f837c9d

livecdfs-update.sh: Run env-update to pick up any /etc/env.d/ changes

Otherwise the XSESSION change from e523136 (livecdfs-update.sh: Set
XSESSION in /etc/env.d/90xsession, 2013-03-02) is not noticed.

---
 targets/support/livecdfs-update.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/targets/support/livecdfs-update.sh 
b/targets/support/livecdfs-update.sh
index d16248e..a222ace 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -382,3 +382,5 @@ if [ -e /lib/rcscripts/addons/udev-start.sh ]
 then
sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& 
\[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
 fi
+
+env-update

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

2014-12-31 Thread Brian Dolbec 
commit: 33491e71001e1071e7dc331bd183ff7b0d394ba1
Author: Raúl Porcel  gentoo  org>
AuthorDate: Wed Dec 24 14:43:51 2014 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Dec 24 14:43:51 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=33491e71

Fix syntax error

---
 targets/support/create-iso.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 7454adb..d4fd834 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -10,6 +10,7 @@ case ${clst_hostarch} in
alpha)
cdmaker="genisoimage"
cdmakerpkg="app-cdr/cdrkit"
+   ;;
mips)
cdmaker="sgibootcd"
cdmakerpkg="sys-boot/sgibootcd"

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

2014-12-31 Thread Brian Dolbec 
commit: f11d2f64ff8af00bc4ac13e6d74f46c598334a91
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Feb 10 20:06:15 2013 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Jan  1 05:58:06 2015 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f11d2f64

Fix a bug that portage didn't get rebuilt with changed use flags

If clst_PGKCACHE is defined, --newuse was not being added to clst_myemergeopts, 
so then portage was not being rebuilt if portage was already up to date.

Conflicts:
targets/support/chroot-functions.sh

---
 targets/support/chroot-functions.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index ee820ed..3b7f77b 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -170,14 +170,15 @@ setup_pkgmgr(){
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
# Use --update or portage might just waste time/cycles and reinstall 
the same version.
+   # Use --newuse to make sure it rebuilds with any changed use flags.
if [ -n "$1" ];then
echo "Adding USE='${USE} $1' to make.conf for portage build"
[ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> 
/etc/portage/make.conf
-   run_merge --oneshot --update sys-apps/portage
+   run_merge --oneshot --update --newuse sys-apps/portage
sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
else
echo "Updating portage with USE='${USE}'"
-   run_merge --oneshot --update sys-apps/portage
+   run_merge --oneshot --update --newuse sys-apps/portage
fi
 }

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

2014-09-10 Thread Brian Dolbec 
commit: b0377343dd8d6f90850bb200f71e18ad13440308
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Sep  1 19:32:22 2014 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Thu Sep 11 03:01:54 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b0377343

chroot-functions.sh: Fix a mis-worded comment

Fixes: 900554b0b067e76d3806e520357d91adbfa4fa0c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto)  gentoo.org> 
(Mon 19 Dec 2011 11:14:05 PM PST)
subject: Make sure portage updates itself at the start of stage1 - thanks to 
Zac for noticing the issue.

---
 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index ce56157..a31e8bf 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -169,7 +169,7 @@ setup_pkgmgr(){
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
-   # Use --update or portage won't reinstall the same version.
+   # Use --update or portage might just waste time/cycles and reinstall 
the same version.
[ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> 
/etc/portage/make.conf
run_merge --oneshot --update sys-apps/portage
sed -i '/USE="${USE} build"/d' /etc/portage/make.conf

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

2014-09-10 Thread Brian Dolbec 
commit: 79f9731e7dd3b632b10ac6a993e61417820fe604
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Feb 11 23:54:36 2013 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Thu Sep 11 03:05:37 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=79f9731e

Fix a relative path bug

This is part 2 of the bugfix.  The first part got committed in:

commit: 2718211aa28019b8142ae8efe2eefdbb67b6aedb
Author: Brian Dolbec  gentoo.org> (Sat 11 Jan 2014 08:53:12 PM PST)
Subject: Remove some troublesome trailing slashes from paths

---
 targets/support/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index c8757d4..0894b35 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -34,7 +34,7 @@ exec_in_chroot(){
 
echo "Running ${file_name} in chroot:"
echo "${clst_CHROOT} ${chroot_path} ${destdir}/${file_name}"
-   ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
+   ${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1
 
delete_from_chroot ${destdir}/${file_name}
delete_from_chroot ${destdir}/chroot-functions.sh

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

2014-09-01 Thread Brian Dolbec 
commit: e94bdc1cc1798932812f5a64cf885d4448be2a82
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Feb 11 23:54:36 2013 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Tue Sep  2 05:46:13 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e94bdc1c

Fix a relative path bug

This is part 2 of the bugfix.  The first part got committed in:

commit: 2718211aa28019b8142ae8efe2eefdbb67b6aedb
Author: Brian Dolbec  gentoo.org> (Sat 11 Jan 2014 08:53:12 PM PST)
Subject: Remove some troublesome trailing slashes from paths

---
 targets/support/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index c8757d4..0894b35 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -34,7 +34,7 @@ exec_in_chroot(){
 
echo "Running ${file_name} in chroot:"
echo "${clst_CHROOT} ${chroot_path} ${destdir}/${file_name}"
-   ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
+   ${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1
 
delete_from_chroot ${destdir}/${file_name}
delete_from_chroot ${destdir}/chroot-functions.sh

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

2014-09-01 Thread Brian Dolbec 
commit: 5ce1d5852a151ca2da6b592a6826c73acf74b282
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Sep  1 18:12:40 2014 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Tue Sep  2 05:43:37 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5ce1d585

chroot-functions.sh: Remove --nodeps option from portage update.

This option prevented new deps from being installed with a portage upgrade.

---
 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5c30537..ce56157 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -171,7 +171,7 @@ setup_pkgmgr(){
# just let emerge @system could merge it.
# Use --update or portage won't reinstall the same version.
[ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> 
/etc/portage/make.conf
-   run_merge --oneshot --nodeps --update sys-apps/portage
+   run_merge --oneshot --update sys-apps/portage
sed -i '/USE="${USE} build"/d' /etc/portage/make.conf
 }

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

2014-09-01 Thread Brian Dolbec 
commit: a1583c5b98614c27d00af725b3f4c5daeed502ce
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Sep  1 19:32:22 2014 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Tue Sep  2 05:43:37 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a1583c5b

chroot-functions.sh: Fix a mis-worded comment

Fixes: 900554b0b067e76d3806e520357d91adbfa4fa0c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto)  gentoo.org> 
(Mon 19 Dec 2011 11:14:05 PM PST)
subject: Make sure portage updates itself at the start of stage1 - thanks to 
Zac for noticing the issue.

---
 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index ce56157..3495f14 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -169,7 +169,7 @@ setup_pkgmgr(){
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
-   # Use --update or portage won't reinstall the same version.
+   # Use --update or portage will reinstall the same version.
[ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> 
/etc/portage/make.conf
run_merge --oneshot --update sys-apps/portage
sed -i '/USE="${USE} build"/d' /etc/portage/make.conf

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

2014-09-01 Thread Brian Dolbec 
commit: 1a2e4242eb2297cae7e5305cb62c22c8ab0f8fbb
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Sep  1 19:32:22 2014 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Tue Sep  2 01:41:00 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1a2e4242

chroot-functions.sh: Fix a mis-worded comment

Fixes: 900554b0b067e76d3806e520357d91adbfa4fa0c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto)  gentoo.org> 
(Mon 19 Dec 2011 11:14:05 PM PST)
subject: Make sure portage updates itself at the start of stage1 - thanks to 
Zac for noticing the issue.

---
 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index ce56157..3495f14 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -169,7 +169,7 @@ setup_pkgmgr(){
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
-   # Use --update or portage won't reinstall the same version.
+   # Use --update or portage will reinstall the same version.
[ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> 
/etc/portage/make.conf
run_merge --oneshot --update sys-apps/portage
sed -i '/USE="${USE} build"/d' /etc/portage/make.conf

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

2014-09-01 Thread Brian Dolbec 
commit: 747066e12847a867bc7218597efe7bc22893ef3b
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Feb 11 23:54:36 2013 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Tue Sep  2 01:56:25 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=747066e1

Fix a relative path bug

Conflicts:
targets/support/functions.sh

---
 targets/support/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index c8757d4..0894b35 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -34,7 +34,7 @@ exec_in_chroot(){
 
echo "Running ${file_name} in chroot:"
echo "${clst_CHROOT} ${chroot_path} ${destdir}/${file_name}"
-   ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
+   ${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1
 
delete_from_chroot ${destdir}/${file_name}
delete_from_chroot ${destdir}/chroot-functions.sh

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

2014-09-01 Thread Brian Dolbec 
commit: fffe274d8e8d2e131c0f483e8e61659d4ed51cc8
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Sep  1 18:12:40 2014 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Tue Sep  2 01:41:00 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=fffe274d

chroot-functions.sh: Remove --nodeps option from portage update.

This option prevented new deps from being installed with a portage upgrade.

---
 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5c30537..ce56157 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -171,7 +171,7 @@ setup_pkgmgr(){
# just let emerge @system could merge it.
# Use --update or portage won't reinstall the same version.
[ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> 
/etc/portage/make.conf
-   run_merge --oneshot --nodeps --update sys-apps/portage
+   run_merge --oneshot --update sys-apps/portage
sed -i '/USE="${USE} build"/d' /etc/portage/make.conf
 }

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

2014-04-02 Thread Brian Dolbec 
commit: 5467d551c478beb8f6b4d559d3366a9ed2a8fbe1
Author: Douglas Freed  mtu  edu>
AuthorDate: Mon Mar  3 04:31:29 2014 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Wed Apr  2 20:04:24 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5467d551

livecdfs-update: No tmpfs on /lib/firmware

As of a while ago, we no longer ship a separate firmware tarball, so we
don't need a tmpfs for /lib/firmware anymore, so let's stop mounting
one.  Fixes firmware issues with current minimal install ISOs.

---
 targets/support/livecdfs-update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh 
b/targets/support/livecdfs-update.sh
index 2b41f9d..b017baf 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -101,7 +101,6 @@ echo "" 
>> /etc/fstab
 
 # fstab tweaks
 echo "tmpfs/   tmpfs   defaults
0 0" >> /etc/fstab
-echo "tmpfs/lib/firmware   tmpfs   defaults0 0" >> 
/etc/fstab
 echo "tmpfs/usr/portagetmpfs   defaults0 0" >> 
/etc/fstab
 # If /usr/lib/X11/xkb/compiled then make it tmpfs
 if [ -d /usr/lib/X11/xkb/compiled ]

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

2014-03-22 Thread Brian Dolbec 
commit: 08751b64254562856e0cda5b81e23ca92c0e7236
Author: Douglas Freed  mtu  edu>
AuthorDate: Mon Mar  3 04:31:29 2014 +
Commit: Brian Dolbec  gmail  com>
CommitDate: Sat Mar 22 18:01:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=08751b64

livecdfs-update: No tmpfs on /lib/firmware

As of a while ago, we no longer ship a separate firmware tarball, so we
don't need a tmpfs for /lib/firmware anymore, so let's stop mounting
one.  Fixes firmware issues with current minimal install ISOs.

---
 targets/support/livecdfs-update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh 
b/targets/support/livecdfs-update.sh
index 2b41f9d..b017baf 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -101,7 +101,6 @@ echo "" 
>> /etc/fstab
 
 # fstab tweaks
 echo "tmpfs/   tmpfs   defaults
0 0" >> /etc/fstab
-echo "tmpfs/lib/firmware   tmpfs   defaults0 0" >> 
/etc/fstab
 echo "tmpfs/usr/portagetmpfs   defaults0 0" >> 
/etc/fstab
 # If /usr/lib/X11/xkb/compiled then make it tmpfs
 if [ -d /usr/lib/X11/xkb/compiled ]