From 38b143640e8b80dccd097c7161da0f50c691dd97 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 11 Apr 2013 11:38:51 +0200 Subject: 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'. --- stage1.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'stage1.sh') 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 < 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//'` -- cgit v1.2.3