summaryrefslogtreecommitdiffstats
path: root/stage2
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2012-06-26 21:49:09 -0400
committerDJ Delorie <dj@delorie.com>2012-06-26 21:49:09 -0400
commit989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea (patch)
tree7ca707e1503139bedc8ecd511e7e4928eb2f1a16 /stage2
parent257e214b8e4f79a77feb25399c53a0e2ef8274b1 (diff)
downloadbootstrap.git.DONOTUSE-989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea.tar.gz
bootstrap.git.DONOTUSE-989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea.tar.xz
bootstrap.git.DONOTUSE-989ff8e43ac4f5abaa7a5a23f5c364de7eb4acea.zip
F17 udpates
Various updates to stage 1 and 2 to build with F17 GA SRPMs
Diffstat (limited to 'stage2')
-rwxr-xr-xstage240
1 files changed, 34 insertions, 6 deletions
diff --git a/stage2 b/stage2
index 5037927..b249576 100755
--- a/stage2
+++ b/stage2
@@ -66,6 +66,8 @@ BUILDDIR=$TOP/builds
# The cross-compiler target
TARGET=armv7hl-redhat-linux-gnueabi
+export TARGET BUILDDIR J SRC STAGE2 MYDIR TOP
+
if [ -f $MYDIR/local.conf ]
then
. $MYDIR/local.conf
@@ -140,6 +142,8 @@ fix_la()
done
}
+test -d /stage2/done || mkdir /stage2/done
+
case "$1" in
"" )
go clean
@@ -148,11 +152,20 @@ case "$1" in
# enabled recipes start with [0-9]{4}-
# disabled recipes start with XXXX-
- for PKG in /stage2/recipe.d/[0-9][0-9][0-9][0-9]-*
- do
- PKG="$(basename $PKG|sed 's/^[0-9]{4}-//')"
- go "$PKG"
- done
+
+ for PKG in /stage2/recipe.d/[0-9][0-9][0-9][0-9]-*
+ do
+ PKG="$(basename $PKG|sed 's/^[0-9]*-//')"
+ if [ ! -f "/stage2/done/$PKG" ]
+ then
+ if go "$PKG"
+ then
+ echo "$PKG" OK
+ else
+ echo "$PKG" BAD
+ fi
+ fi
+ done
;;
"clean" )
@@ -171,10 +184,25 @@ case "$1" in
#--------------------------------------------------
+ *~ ) ;;
+
* )
if [ -f "/stage2/recipe.d/"[0-9][0-9][0-9][0-9]"-$1" ]
then
- . /stage2/recipe.d/[0-9][0-9][0-9][0-9]-$1
+ echo
+ echo
+ echo Building $1 . . .
+ echo
+ set -e
+
+ . /stage2/recipe.d/[0-9][0-9][0-9][0-9]-"$1"
+
+ set +e
+ echo
+ echo Building $1 succeeded
+ echo
+ : > /stage2/done/$1
+ exit 0
else
echo "No build recipe found for $1" >&2
exit 2