[gentoo-commits] catalyst r1332 - in trunk: . targets/grp targets/livecd-stage1 targets/stage1 targets/stage3 targets/stage4 targets/support targets/tinderbox

[Chris Gianelloni (wolf31o2)]

Author: wolf31o2
Date: 2008-02-28 03:41:54 +0000 (Thu, 28 Feb 2008)
New Revision: 1332

Modified:
   trunk/ChangeLog
   trunk/targets/grp/grp-chroot.sh
   trunk/targets/livecd-stage1/livecd-stage1-chroot.sh
   trunk/targets/stage1/stage1-chroot.sh
   trunk/targets/stage3/stage3-chroot.sh
   trunk/targets/stage4/stage4-chroot.sh
   trunk/targets/support/chroot-functions.sh
   trunk/targets/tinderbox/tinderbox-chroot.sh
Log:
Rearrange some of the functions in chroot-functions.sh in preparation for some upcoming changes and rename setup_portage to setup_pkgmgr.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-28 03:25:59 UTC (rev 1331)
+++ trunk/ChangeLog	2008-02-28 03:41:54 UTC (rev 1332)
@@ -2,6 +2,14 @@
 # $Id: $
 
   28 Feb 2008; Chris Gianelloni <wolf31o2@g.o>
+  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@g.o>
   targets/stage1/stage1-controller.sh:
   Removing an extra env-update call from stage1's preclean.
 

Modified: trunk/targets/grp/grp-chroot.sh
===================================================================
--- trunk/targets/grp/grp-chroot.sh	2008-02-28 03:25:59 UTC (rev 1331)
+++ trunk/targets/grp/grp-chroot.sh	2008-02-28 03:41:54 UTC (rev 1332)
@@ -3,7 +3,7 @@
 source /tmp/chroot-functions.sh
 
 ## START BUILD
-setup_portage
+setup_pkgmgr
 
 unset DISTDIR
 

Modified: trunk/targets/livecd-stage1/livecd-stage1-chroot.sh
===================================================================
--- trunk/targets/livecd-stage1/livecd-stage1-chroot.sh	2008-02-28 03:25:59 UTC (rev 1331)
+++ trunk/targets/livecd-stage1/livecd-stage1-chroot.sh	2008-02-28 03:41:54 UTC (rev 1332)
@@ -3,6 +3,6 @@
 source /tmp/chroot-functions.sh
 
 ## START BUILD
-setup_portage
+setup_pkgmgr
 
 run_emerge "${clst_packages}"

Modified: trunk/targets/stage1/stage1-chroot.sh
===================================================================
--- trunk/targets/stage1/stage1-chroot.sh	2008-02-28 03:25:59 UTC (rev 1331)
+++ trunk/targets/stage1/stage1-chroot.sh	2008-02-28 03:41:54 UTC (rev 1332)
@@ -20,7 +20,7 @@
 fi
 
 ## START BUILD
-clst_root_path=/ setup_portage
+clst_root_path=/ setup_pkgmgr
 
 USE="-build" run_emerge "--oneshot --nodeps virtual/baselayout"
 

Modified: trunk/targets/stage3/stage3-chroot.sh
===================================================================
--- trunk/targets/stage3/stage3-chroot.sh	2008-02-28 03:25:59 UTC (rev 1331)
+++ trunk/targets/stage3/stage3-chroot.sh	2008-02-28 03:41:54 UTC (rev 1332)
@@ -3,6 +3,6 @@
 source /tmp/chroot-functions.sh
 
 ## START BUILD
-setup_portage
+setup_pkgmgr
 
 run_emerge "-e system"

Modified: trunk/targets/stage4/stage4-chroot.sh
===================================================================
--- trunk/targets/stage4/stage4-chroot.sh	2008-02-28 03:25:59 UTC (rev 1331)
+++ trunk/targets/stage4/stage4-chroot.sh	2008-02-28 03:41:54 UTC (rev 1332)
@@ -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

Modified: trunk/targets/support/chroot-functions.sh
===================================================================
--- trunk/targets/support/chroot-functions.sh	2008-02-28 03:25:59 UTC (rev 1331)
+++ trunk/targets/support/chroot-functions.sh	2008-02-28 03:41:54 UTC (rev 1332)
@@ -135,42 +135,42 @@
 	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

Modified: trunk/targets/tinderbox/tinderbox-chroot.sh
===================================================================
--- trunk/targets/tinderbox/tinderbox-chroot.sh	2008-02-28 03:25:59 UTC (rev 1331)
+++ trunk/targets/tinderbox/tinderbox-chroot.sh	2008-02-28 03:41:54 UTC (rev 1332)
@@ -3,7 +3,7 @@
 source /tmp/chroot-functions.sh
 
 # START THE BUILD
-setup_portage
+setup_pkgmgr
 
 # Backup pristine system
 

-- 
gentoo-commits@l.g.o mailing list