diff options
| -rw-r--r-- | files/build-1.0_rc6.packages | 2 | ||||
| -rw-r--r-- | profiles/package.mask | 4 | ||||
| -rwxr-xr-x | scripts/bootstrap.sh | 21 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/digest-baselayout-1.6 | 2 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/profile | 4 |
5 files changed, 16 insertions, 17 deletions
diff --git a/files/build-1.0_rc6.packages b/files/build-1.0_rc6.packages index 8a22de0b23bd..cf2713ab3db6 100644 --- a/files/build-1.0_rc6.packages +++ b/files/build-1.0_rc6.packages @@ -25,4 +25,4 @@ ./net-misc/wget/wget-1.7-r1.ebuild ./net-misc/rsync/rsync-2.4.6-r4.ebuild ./sys-kernel/linux-headers/linux-headers-2.4.6-r3.ebuild -./app-editors/e3/e3-1.7.ebuild +./app-editors/e3/e3-1.7-r1.ebuild diff --git a/profiles/package.mask b/profiles/package.mask index b87b6133c244..b82a27777fdc 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -86,10 +86,6 @@ app-editors/gtk-xemacs #=sys-kernel/linux-extras-2.4.5.5 # chadh -# e3-1.7-r1 does not work on cvs.gentoo.org (gzexe executable does not work). -=app-editors/e3-1.7-r1 - -# chadh # this is the pam for rc6 #=sys-libs/pam-0.75-r1 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index d494a364713a..8fbf01c5582f 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -2,26 +2,29 @@ LIST=$1 +myPORTAGE=`grep "sys-apps/portage" $1` myGETTEXT=`grep "sys-devel/gettext" $1` myBINUTILS=`grep "sys-devel/binutils" $1` myGCC=`grep "sys-devel/gcc" $1` myGLIBC=`grep "sys-libs/glibc" $1` +echo "Using PORTAGE $myPORTAGE" echo "Using BINUTILS $myBINUTILS" echo "Using GCC $myGCC" echo "Using GETTEXT $myGETTEXT" echo "Using GLIBC $myGLIBC" export USE="build" -export STEPS="clean unpack compile install qmerge clean" cd /usr/portage -ebuild $myBINUTILS $STEPS || exit -ebuild $myGCC $STEPS || exit -ebuild $myGETTEXT $STEPS || exit +#commented out for now; why do we need to do this? +#emerge $myPORTAGE || exit +#emerge $myBINUTILS || exit +#emerge $myGCC || exit +#emerge $myGETTEXT || exit unset USE -export USE="`python -c 'import portage; print portage.settings["USE"];'` bootstrap" -ebuild $myGLIBC $STEPS || exit -ebuild $myGETTEXT $STEPS || exit -ebuild $myBINUTILS $STEPS || exit -ebuild $myGCC $STEPS || exit +export USE="`spython -c 'import portage; print portage.settings["USE"];'` bootstrap" +emerge $myGLIBC || exit +emerge $myGETTEXT || exit +emerge $myBINUTILS || exit +emerge $myGCC || exit unset USE diff --git a/sys-apps/baselayout/files/digest-baselayout-1.6 b/sys-apps/baselayout/files/digest-baselayout-1.6 index 9e05063ae68a..e8689af7387a 100644 --- a/sys-apps/baselayout/files/digest-baselayout-1.6 +++ b/sys-apps/baselayout/files/digest-baselayout-1.6 @@ -1 +1 @@ -MD5 744a89e74b36619dd640c6a60ff3f94d rc-scripts-1.1.tar.bz2 +MD5 8315860e46f7ae3e4a2b46479c1baf22 rc-scripts-1.1.1.tar.bz2 diff --git a/sys-apps/baselayout/files/profile b/sys-apps/baselayout/files/profile index 250526bc6379..a1429c4454db 100644 --- a/sys-apps/baselayout/files/profile +++ b/sys-apps/baselayout/files/profile @@ -9,12 +9,12 @@ then fi if [ `/usr/bin/whoami` == 'root' ] ; then - export PS1='\[\033[01;31;40m\]\h \[\033[01;34;40m\]\W > \[\033[00m\]' + export PS1='\[\033[01;31;40m\]\h \[\033[01;34;40m\]\W \$ \[\033[00m\]' export PATH=/bin:/sbin:/usr/bin:/usr/sbin:${ROOTPATH} #077 would be more secure, but 022 is generally quite realistic umask 022 else - export PS1='\[\033[01;32;40m\]\u@\h \[\033[01;34;40m\]\W > \[\033[00m\]' + export PS1='\[\033[01;32;40m\]\u@\h \[\033[01;34;40m\]\W \$ \[\033[00m\]' export PATH=/bin:/usr/bin:${PATH} umask 022 fi |