Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-05-10 19:20:43 +02:00
10 changed files with 728 additions and 8 deletions

View File

@@ -247,6 +247,7 @@ buildtoolchain() {
NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
lfsmake1 ccache PASS=1
lfsmake1 make PASS=1
lfsmake1 binutils PASS=1
lfsmake1 gcc PASS=1
export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@ -270,7 +271,7 @@ buildtoolchain() {
lfsmake1 grep
lfsmake1 gzip
lfsmake1 m4
lfsmake1 make
lfsmake1 make PASS=2
lfsmake1 patch
lfsmake1 perl
lfsmake1 sed
@@ -689,6 +690,7 @@ buildipfire() {
ipfiremake swig
ipfiremake python-m2crypto
ipfiremake crda
ipfiremake libsatsolver
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild