Update rootfiles (due to new miniupnpd).

This commit is contained in:
Michael Tremer
2010-11-22 13:22:11 +01:00
parent 54194ba452
commit c37586818d
4 changed files with 18 additions and 7 deletions

10
make.sh
View File

@@ -227,6 +227,10 @@ prepareenv() {
}
buildtoolchain() {
if [ "$(uname -m)" = "x86_64" ]; then
exiterror "Cannot build toolchain on x86_64. Please use the download."
fi
LOGFILE="$BASEDIR/log/_build.toolchain.log"
export LOGFILE
ORG_PATH=$PATH
@@ -790,7 +794,7 @@ ipfirepackages() {
case "$1" in
build)
clear
BUILDMACHINE=`uname -m`
BUILDMACHINE="i686"
PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
#only restore on a clean disk
if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@ -918,7 +922,7 @@ toolchain)
prepareenv
beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
buildtoolchain
BUILDMACHINE=`uname -m`
BUILDMACHINE="i686"
echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
@@ -930,7 +934,7 @@ toolchain)
stdumount
;;
gettoolchain)
BUILDMACHINE=`uname -m`
BUILDMACHINE="i686"
# arbitrary name to be updated in case of new toolchain package upload
PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then