Fixes for /usr/xbin binaries bootstrap dir.

diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index f2486854d7458d6496cd3401da258e79cd5149e7..d1e4552faf5babdd431e0749170036487a6db26c 100755 (executable)
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-export PATH="$1"
 export SHELL=/bin/sh
 cd /usr/src 
 make etcfiles

diff --git a/tools/release.sh b/tools/release.sh
index 2cbfb5052340aa4bbf69d971c2d144eb6a886346..0f455a354f315995364f125745234df2da6ec792 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -243,7 +243,7 @@ mount $TMPDISK $RELEASEDIR/usr || exit
 mkdir -p $RELEASEDIR/tmp
 mkdir -p $RELEASEDIR/usr/tmp
 mkdir -p $RELEASEDIR/$XBIN
-mkdir -p $RELEASEDIR/usr
+mkdir -p $RELEASEDIR/usr/bin
 mkdir -p $RELEASEDIR/bin
 mkdir -p $RELEASEPACKAGE
 mkdir -p $RELEASEPACKAGESOURCES
@@ -251,7 +251,8 @@ mkdir -p $RELEASEPACKAGESOURCES
 echo " * Transfering bootstrap dirs to $RELEASEDIR"
 cp -p /bin/* /usr/bin/* $RELEASEDIR/$XBIN
 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 ]
 then   echo " * Indexing packages"
@@ -312,7 +313,7 @@ if [ "$USB" -eq 0 ]
 then   date >$RELEASEDIR/CD
 fi
 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 " * Removing bootstrap files"
 rm -rf $RELEASEDIR/$XBIN