Merge remote-tracking branch 'origin/kernel-update' into glibc-update2

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 1d4b990e515685a0a97ab7c813235327bea554a7..9d35e6ee4b1dd63ce385dede8b5c041c56149358 100755 (executable)
--- 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
 
@@ -299,13 +307,19 @@ buildbase() {
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2
-    lfsmake2 linux2 HEADERS=1
+    lfsmake2 linux2                    HEADERS=1
     lfsmake2 man-pages
     lfsmake2 glibc
     lfsmake2 tzdata
-    lfsmake2 cleanup-toolchain PASS=3
+    lfsmake2 cleanup-toolchain         PASS=3
+    lfsmake2 zlib
     lfsmake2 binutils
+    lfsmake2 gmp
+    lfsmake2 gmp-compat
+    lfsmake2 mpfr
+    lfsmake2 file
     lfsmake2 gcc
+    lfsmake2 sed
     lfsmake2 berkeley
     lfsmake2 coreutils
     lfsmake2 iana-etc
@@ -313,11 +327,9 @@ buildbase() {
     lfsmake2 bison
     lfsmake2 ncurses
     lfsmake2 procps
-    lfsmake2 sed
     lfsmake2 libtool
     lfsmake2 perl
     lfsmake2 readline
-    lfsmake2 zlib
     lfsmake2 autoconf
     lfsmake2 automake
     lfsmake2 bash
@@ -325,7 +337,6 @@ buildbase() {
     lfsmake2 diffutils
     lfsmake2 e2fsprogs
     lfsmake2 ed
-    lfsmake2 file
     lfsmake2 findutils
     lfsmake2 flex
     lfsmake2 gawk
@@ -452,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"
@@ -487,7 +484,6 @@ buildipfire() {
   ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
-  ipfiremake gmp
   ipfiremake pam
   ipfiremake openssl
   ipfiremake curl
@@ -800,7 +796,6 @@ buildinstaller() {
   ipfiremake mbr
   ipfiremake memtest
   ipfiremake installer
-  cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
   installmake strip
   ipfiremake initrd
 }