Bootstrap: update stage1.sh script.

The stage1.sh script works again with the current source.local tree.
Fixed the issues with new coreutils, new kernel and 'patch'.

4 files changed, 28 insertions, 7 deletions

diff --git a/doc/distcc b/doc/distcc
index ad56081..1afdfbe 100644
--- a/doc/distcc
+++ b/doc/distcc
@@ -8,8 +8,6 @@ Setting up a distcc environment:
 
 # ===========================================================================
 
-My own way of setting it all up:
-
 Setting up distcc on the host (the ARM computer):
 
 Add the following to /etc/profile.d/distcc.sh :
diff --git a/doc/git.txt b/doc/git.txt
index 7838849..a20c563 100644
--- a/doc/git.txt
+++ b/doc/git.txt
@@ -2,9 +2,27 @@ Setting up a work environment:
 
 First, clone the git repository (which does not contain source tarballs) and
 then sync the source tree on top of it.
-The git excluse list will ensure that "git status" will not report the source
+The git exclude list will ensure that "git status" will not report the source
 tarballs as 'untracked'.
 
 $ git clone git://taper.alienbase.nl/bootstrap.git
 $ cd bootstrap
 $ rsync -av  rsync://taper.alienbase.nl/mirrors/alienarm/bootstrap/ .
+
+This is how the git exclude file should look like in your local git clone:
+$ cat bootstrap/.git/info/exclude 
+# ------ 8< -----------------------------------------------------------------
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+*~
+*.tar.bz2
+*.tar.gz
+*.tar.xz
+*.t?z
+!diff.?z*
+!patch.?z*
+# ------ 8< -----------------------------------------------------------------
diff --git a/stage1.sh b/stage1.sh
index f52cf4b..972bc92 100755
--- a/stage1.sh
+++ b/stage1.sh
@@ -158,11 +158,11 @@ mcd()
 getsb()
 {
   SOUT=${2:-$SLACKSOURCE}
-  PKGDIR=$(find $SLACKSOURCE_LOCAL/ -maxdepth 2 -type d -name $1)
+  PKGDIR=$(dirname $(find $SLACKSOURCE_LOCAL/ -maxdepth 3 -type f -name $1.SlackBuild))
   if [ -n "$PKGDIR" -a -d $PKGDIR ]; then
     true
   else
-    PKGDIR=$(find $SLACKROOT/source -maxdepth 2 -type d -name $1)
+    PKGDIR=$(dirname $(find $SLACKROOT/source -maxdepth 3 -type f -name $1.SlackBuild))
   fi
   if [ -n "$PKGDIR" -a -d $PKGDIR ]; then
     echo "Using sources at '$PKGDIR'"
@@ -701,8 +701,13 @@ EOF
      coreutils )
 	getsb coreutils
 	mcd $BUILDDIR/coreutils
-	$SLACKSOURCE/coreutils/coreutils-*/configure $TCONFIGARGS
+        cat <<EOF > config.cache
+fu_cv_sys_stat_statfs2_bsize=yes
+gl_cv_func_working_mkstemp=yes
+EOF
+	$SLACKSOURCE/coreutils/coreutils-*/configure $TCONFIGARGS --cache-file=config.cache PERL=NO
 	notparallel
+	mkdir -p man
 	for i in $(cd $SLACKSOURCE/coreutils/coreutils-*/man; echo *.x)
 	do
 	    base=`echo $i | sed 's/\.x//'`
diff --git a/stage2.sh b/stage2.sh
index 57d47e6..4a12bf6 100755
--- a/stage2.sh
+++ b/stage2.sh
@@ -14,7 +14,7 @@
 # just that one package.
 #
 # The master upstream for this script is:
-#   git://fedorapeople.org/~djdelorie/bootstrap.git
+#   http://fedorapeople.org/cgit/djdelorie/public_git/bootstrap.git/
 #
 # ------------------------------------------------------------
 #