summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Robbins <drobbins@gentoo.org>2001-09-06 07:19:44 +0000
committerDaniel Robbins <drobbins@gentoo.org>2001-09-06 07:19:44 +0000
commit710ecb4c0b1491cb7a0c1c857da210f121f85c5a (patch)
tree1c41789ccbd09cbd8888856d7358791856369837 /scripts
parentAdded instructions for ext3 (diff)
downloadgentoo-2-710ecb4c0b1491cb7a0c1c857da210f121f85c5a.tar.gz
gentoo-2-710ecb4c0b1491cb7a0c1c857da210f121f85c5a.tar.bz2
gentoo-2-710ecb4c0b1491cb7a0c1c857da210f121f85c5a.zip
new rc6 baselayout bootstrap stuff, and an in-progress linux-sources-2.4.9.9
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bootstrap.sh17
1 files changed, 10 insertions, 7 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index b9b495b45347..2bc476d6c314 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -2,6 +2,8 @@
LIST=$1
+#We really need to upgrade baselayout now that it's possible:
+myBASELAYOUT=`grep "sys-apps/baselayout" $1`
myPORTAGE=`grep "sys-apps/portage" $1`
myGETTEXT=`grep "sys-devel/gettext" $1`
myBINUTILS=`grep "sys-devel/binutils" $1`
@@ -9,11 +11,12 @@ myGCC=`grep "sys-devel/gcc" $1`
myGLIBC=`grep "sys-libs/glibc" $1`
myTEXINFO=`grep "sys-apps/texinfo" $1`
-echo "Using PORTAGE $myPORTAGE"
-echo "Using BINUTILS $myBINUTILS"
-echo "Using GCC $myGCC"
-echo "Using GETTEXT $myGETTEXT"
-echo "Using GLIBC $myGLIBC"
+echo "Using $myBASELAYOUT"
+echo "Using $myPORTAGE"
+echo "Using $myBINUTILS"
+echo "Using $myGCC"
+echo "Using $myGETTEXT"
+echo "Using $myGLIBC"
cleanup() {
cp /etc/make.conf.build /etc/make.conf
@@ -42,7 +45,7 @@ export CONFIG_PROTECT=""
#above allows portage to overwrite stuff
cd /usr/portage
emerge $myPORTAGE #separate, so that the next command uses the *new* emerge
-emerge $myBINUTILS $myGCC $myGETTEXT || cleanup 1
+emerge $myBASELAYOUT $myBINUTILS $myGCC $myGETTEXT || cleanup 1
if [ "$use_unset" = "yes" ]
then
unset USE
@@ -53,4 +56,4 @@ fi
#export USE="`spython -c 'import portage; print portage.settings["USE"];'` bootstrap"
emerge $myGLIBC $myGETTEXT $myBINUTILS $myGCC $myTEXINFO || cleanup 1
#restore settings
-cleanup 0 \ No newline at end of file
+cleanup 0