Fixes for /usr/xbin binaries bootstrap dir.

This commit is contained in:
Ben Gras 2007-02-08 17:41:40 +00:00
parent 20a13246a8
commit 304471a107
2 changed files with 4 additions and 4 deletions

View file

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
set -e set -e
export PATH="$1"
export SHELL=/bin/sh export SHELL=/bin/sh
cd /usr/src cd /usr/src
make etcfiles make etcfiles

View file

@ -243,7 +243,7 @@ mount $TMPDISK $RELEASEDIR/usr || exit
mkdir -p $RELEASEDIR/tmp mkdir -p $RELEASEDIR/tmp
mkdir -p $RELEASEDIR/usr/tmp mkdir -p $RELEASEDIR/usr/tmp
mkdir -p $RELEASEDIR/$XBIN mkdir -p $RELEASEDIR/$XBIN
mkdir -p $RELEASEDIR/usr mkdir -p $RELEASEDIR/usr/bin
mkdir -p $RELEASEDIR/bin mkdir -p $RELEASEDIR/bin
mkdir -p $RELEASEPACKAGE mkdir -p $RELEASEPACKAGE
mkdir -p $RELEASEPACKAGESOURCES mkdir -p $RELEASEPACKAGESOURCES
@ -251,7 +251,8 @@ mkdir -p $RELEASEPACKAGESOURCES
echo " * Transfering bootstrap dirs to $RELEASEDIR" echo " * Transfering bootstrap dirs to $RELEASEDIR"
cp -p /bin/* /usr/bin/* $RELEASEDIR/$XBIN cp -p /bin/* /usr/bin/* $RELEASEDIR/$XBIN
cp -rp /usr/lib $RELEASEDIR/usr cp -rp /usr/lib $RELEASEDIR/usr
cp -rp /bin/sh $RELEASEDIR/bin cp -rp /bin/bigsh /bin/sh $RELEASEDIR/bin
cp -rp /usr/bin/make /usr/bin/install /usr/bin/yacc /usr/bin/flex $RELEASEDIR/usr/bin
if [ -d $PACKAGEDIR -a -d $PACKAGESOURCEDIR -a $PACKAGES -ne 0 ] if [ -d $PACKAGEDIR -a -d $PACKAGESOURCEDIR -a $PACKAGES -ne 0 ]
then echo " * Indexing packages" then echo " * Indexing packages"
@ -312,7 +313,7 @@ if [ "$USB" -eq 0 ]
then date >$RELEASEDIR/CD then date >$RELEASEDIR/CD
fi fi
echo " * Chroot build" echo " * Chroot build"
chroot $RELEASEDIR "/$XBIN/sh -x /usr/src/tools/chrootmake.sh /$XBIN" || exit 1 chroot $RELEASEDIR "PATH=/$XBIN sh -x /usr/src/tools/chrootmake.sh" || exit 1
echo " * Chroot build done" echo " * Chroot build done"
echo " * Removing bootstrap files" echo " * Removing bootstrap files"
rm -rf $RELEASEDIR/$XBIN rm -rf $RELEASEDIR/$XBIN