X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=9d35e6ee4b1dd63ce385dede8b5c041c56149358;hp=ab6640ebc9aa76b5f5f927c891108a096f7a8dd2;hb=9572596c47e961c6f4d970b4c4c72bd5f90920e0;hpb=28d70963708626d1248262a9a84626b0d8fbb483

diff --git a/make.sh b/make.sh
index ab6640ebc9..9d35e6ee4b 100755
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
-TOOLCHAINVER=3
+TOOLCHAINVER=4
 
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then
@@ -240,7 +240,7 @@ buildtoolchain() {
             ;;
 
         # ARM
-        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l)
+        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l)
             # These are working.
             ;;
         armv5tel:*)
@@ -255,6 +255,14 @@ buildtoolchain() {
         exiterror "Cannot build toolchain on ipfire. Please use the download."
     fi
 
+    if [ ! -e /usr/include/asm -o ! -e /usr/include/bits -o ! -e /usr/include/gnu -o ! -e /usr/include/sys ]; then
+        exiterror "Cannot build toolchain without (asm, bits, gnu or sys includes). Please fix or use the download."
+    fi
+
+    if [ ! -e /usr/lib/libc.so ]; then
+        exiterror "Cannot build toolchain without (/usr/lib/libc.so). Please fix or use the download."
+    fi
+
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
 
@@ -455,20 +463,6 @@ buildipfire() {
 #    ipfiremake e1000e			KCFG="-omap"
 #    ipfiremake igb			KCFG="-omap"
 
-    # arm-versatile kernel build
-    ipfiremake linux			KCFG="-versatile"
-#    ipfiremake v4l-dvb			KCFG="-versatile"
-#    ipfiremake kvm-kmod			KCFG="-versatile"
-#    ipfiremake mISDN			KCFG="-versatile"
-#    ipfiremake dahdi			KCFG="-versatile" KMOD=1
-    ipfiremake cryptodev		KCFG="-versatile"
-    ipfiremake compat-wireless		KCFG="-versatile"
-#    ipfiremake r8169			KCFG="-versatile"
-#    ipfiremake r8168			KCFG="-versatile"
-#    ipfiremake r8101			KCFG="-versatile"
-#    ipfiremake e1000			KCFG="-versatile"
-#    ipfiremake e1000e			KCFG="-versatile"
-#    ipfiremake igb			KCFG="-versatile"
     # arm-kirkwood kernel build
     ipfiremake linux			KCFG="-kirkwood"
 #    ipfiremake v4l-dvb			KCFG="-kirkwood"