Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...

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

diff --git a/make.sh b/make.sh
index ab6640ebc9aa76b5f5f927c891108a096f7a8dd2..c62e748d003ed5c1ca653f606a2429848ada1a62 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=5
 
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then
@@ -232,7 +232,7 @@ buildtoolchain() {
     local error=false
     case "${MACHINE}:$(uname -m)" in
         # x86
-        i586:i586|i586:i686)
+        i586:i586|i586:i686|i586:x86_64)
             # These are working.
             ;;
         i586:*)
@@ -240,7 +240,7 @@ buildtoolchain() {
             ;;
 
         # ARM
-        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l)
+        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l)
             # These are working.
             ;;
         armv5tel:*)
@@ -251,8 +251,9 @@ buildtoolchain() {
     ${error} && \
         exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any."
 
-    if [ "$(uname -r | grep ipfire)" ]; then
-        exiterror "Cannot build toolchain on ipfire. Please use the download."
+    local gcc=$(type -p gcc)
+    if [ -z "${gcc}" ]; then
+        exiterror "Could not find GCC. You will need a working build enviroment in order to build the toolchain."
     fi
 
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
@@ -260,7 +261,6 @@ buildtoolchain() {
 
     local ORG_PATH=$PATH
     export PATH="/tools/ccache/bin:/tools/bin:$PATH"
-    lfsmake1 fake-environ              PASS=1
     lfsmake1 ccache                    PASS=1
     lfsmake1 binutils                  PASS=1
     lfsmake1 gcc                       PASS=1
@@ -269,7 +269,6 @@ buildtoolchain() {
     lfsmake1 cleanup-toolchain         PASS=1
     lfsmake1 binutils                  PASS=2
     lfsmake1 gcc                       PASS=2
-    lfsmake1 fake-environ              PASS=2
     lfsmake1 ccache                    PASS=2
     lfsmake1 tcl
     lfsmake1 expect
@@ -291,6 +290,7 @@ buildtoolchain() {
     lfsmake1 sed
     lfsmake1 tar
     lfsmake1 texinfo
+    lfsmake1 fake-environ
     lfsmake1 cleanup-toolchain         PASS=2
     export PATH=$ORG_PATH
 }
@@ -348,7 +348,6 @@ buildbase() {
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
-    lfsmake2 reiser4progs
     lfsmake2 shadow
     lfsmake2 sysklogd
     lfsmake2 sysvinit
@@ -433,7 +432,7 @@ buildipfire() {
 #    ipfiremake mISDN                  KCFG="-rpi"
 #    ipfiremake dahdi                  KCFG="-rpi" KMOD=1
     ipfiremake cryptodev               KCFG="-rpi"
-#    ipfiremake compat-wireless                KCFG="-rpi"
+    ipfiremake compat-wireless         KCFG="-rpi"
 #    ipfiremake r8169                  KCFG="-rpi"
 #    ipfiremake r8168                  KCFG="-rpi"
 #    ipfiremake r8101                  KCFG="-rpi"
@@ -447,7 +446,7 @@ buildipfire() {
 #    ipfiremake mISDN                  KCFG="-omap"
 #    ipfiremake dahdi                  KCFG="-omap" KMOD=1
     ipfiremake cryptodev               KCFG="-omap"
-#    ipfiremake compat-wireless                KCFG="-omap"
+    ipfiremake compat-wireless         KCFG="-omap"
 #    ipfiremake r8169                  KCFG="-omap"
 #    ipfiremake r8168                  KCFG="-omap"
 #    ipfiremake r8101                  KCFG="-omap"
@@ -455,20 +454,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"