Rearrange some of the functions in chroot-functions.sh in preparation for some upcomi...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1332 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index dc188ad8b498efecf0a5b3fb5149a8d2b6e05209..bd9a11a6e7a55b76078638478adad46d9bf14b97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/grp/grp-chroot.sh, targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh,
+  targets/stage4/stage4-chroot.sh, targets/support/chroot-functions.sh,
+  targets/tinderbox/tinderbox-chroot.sh:
+  Rearrange some of the functions in chroot-functions.sh in preparation for
+  some upcoming changes and rename setup_portage to setup_pkgmgr.
+
   28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage1/stage1-controller.sh:
   Removing an extra env-update call from stage1's preclean.

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index df0da4de0acd60b6fba372fc96626e44f5d5acc9..d3465bae36b88a953e1d802511f5ed9c4f82a8c6 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -3,7 +3,7 @@
 source /tmp/chroot-functions.sh
 
 ## START BUILD
-setup_portage
+setup_pkgmgr
 
 unset DISTDIR
 

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 5c6be01439bbba0ce023f2b1c488a37127e7a234..f10de566a2e8ce1d1973401b2ba5a1ff40ab5409 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -3,6 +3,6 @@
 source /tmp/chroot-functions.sh
 
 ## START BUILD
-setup_portage
+setup_pkgmgr
 
 run_emerge "${clst_packages}"

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index e4f344742d1b4323c1e30ef7b4ef9be17971c6ef..a502e328394e55ebd494a6e7da929c4a34c0931c 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -20,7 +20,7 @@ then
 fi
 
 ## START BUILD
-clst_root_path=/ setup_portage
+clst_root_path=/ setup_pkgmgr
 
 USE="-build" run_emerge "--oneshot --nodeps virtual/baselayout"
 

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index a09e1b6cf65635dc1dd78ac948b120c41a921467..839d6f779819fcb1d5da97bc1871013d44d51f3e 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -3,6 +3,6 @@
 source /tmp/chroot-functions.sh
 
 ## START BUILD
-setup_portage
+setup_pkgmgr
 
 run_emerge "-e system"

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 6622980e5e81aa84953a09702f2b230cd2e510c3..d8c8b736cee86d22f308d8143a9f608993065472 100755 (executable)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -3,7 +3,7 @@
 source /tmp/chroot-functions.sh
 
 ## START BUILD
-setup_portage
+setup_pkgmgr
 
 echo "Bringing system up to date using profile specific use flags"
 run_emerge -u system

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index e1c9bacf45e3ab300178190a07206dd6053d26bb..8a614aa09b44970c150dc8c92abc21fe02cdcc04 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -135,42 +135,42 @@ setup_myemergeopts(){
        fi
 }
 
-setup_portage(){
-       # portage needs to be merged manually with USE="build" set to avoid frying
-       # our make.conf. emerge system could merge it otherwise.
-#      if [ "${clst_AUTORESUME}" = "1" -a -e /tmp/.clst_portage ]
-#      then
-#              echo "Portage Autoresume point found not emerging portage"
-#      else
-               USE="build" run_emerge --oneshot --nodeps portage
-#              touch /tmp/.clst_portage || exit 1
-#      fi
-}
-
-setup_gcc(){
-       if [ -x /usr/bin/gcc-config ]
+setup_binutils(){
+       if [ -x /usr/bin/binutils-config ]
        then
-               mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
+               mythang=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
                if [ -z "${mythang}" ]
                then
                        mythang=1
                fi
-               gcc-config ${mythang}; update_env_settings
+               binutils-config ${mythang}; update_env_settings
        fi
 }
 
-setup_binutils(){
-       if [ -x /usr/bin/binutils-config ]
+setup_gcc(){
+       if [ -x /usr/bin/gcc-config ]
        then
-               mythang=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
+               mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
                if [ -z "${mythang}" ]
                then
                        mythang=1
                fi
-               binutils-config ${mythang}; update_env_settings
+               gcc-config ${mythang}; update_env_settings
        fi
 }
 
+setup_pkgmgr(){
+       # portage needs to be merged manually with USE="build" set to avoid frying
+       # our make.conf. emerge system could merge it otherwise.
+#      if [ "${clst_AUTORESUME}" = "1" -a -e /tmp/.clst_portage ]
+#      then
+#              echo "Portage Autoresume point found not emerging portage"
+#      else
+               USE="build" run_emerge --oneshot --nodeps virtual/portage
+#              touch /tmp/.clst_portage || exit 1
+#      fi
+}
+
 cleanup_distcc() {
        rm -rf /etc/distcc/hosts
        for i in cc gcc c++ g++; do

diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index fb281125ef478daabcd29375b221fc0cbfc7eb20..f7c1abafaa910c2409e95cbcfe2c6c73dc3c114a 100755 (executable)
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
@@ -3,7 +3,7 @@
 source /tmp/chroot-functions.sh
 
 # START THE BUILD
-setup_portage
+setup_pkgmgr
 
 # Backup pristine system