toolchain: Reorder building packages.

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

diff --git a/make.sh b/make.sh
index 92ad9300611708dc2ec6edccd129a847b14d82e4..1d4b990e515685a0a97ab7c813235327bea554a7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -257,24 +257,23 @@ buildtoolchain() {
 
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
-    NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
-    export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
-    ORG_PATH=$PATH
-    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
-    lfsmake1 linux2 TOOLS=1 HEADERS=1
+
+    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
+    lfsmake1 linux2                    TOOLS=1 HEADERS=1
     lfsmake1 glibc
-    lfsmake1 cleanup-toolchain PASS=1
-    lfsmake1 fake-environ
+    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
     lfsmake1 dejagnu
-    lfsmake1 gcc               PASS=2
-    lfsmake1 binutils  PASS=2
-    lfsmake1 ccache    PASS=2
     lfsmake1 ncurses
     lfsmake1 bash
     lfsmake1 bzip2
@@ -286,15 +285,13 @@ buildtoolchain() {
     lfsmake1 grep
     lfsmake1 gzip
     lfsmake1 m4
-    lfsmake1 make      PASS=2
+    lfsmake1 make
     lfsmake1 patch
     lfsmake1 perl
     lfsmake1 sed
     lfsmake1 tar
     lfsmake1 texinfo
-    lfsmake1 util-linux
-    lfsmake1 strip
-    lfsmake1 cleanup-toolchain PASS=2
+    lfsmake1 cleanup-toolchain         PASS=2
     export PATH=$ORG_PATH
 }
 
@@ -428,8 +425,32 @@ buildipfire() {
   else
     # arm-omap kernel build
     ipfiremake linux                   KCFG="-rpi"
+#    ipfiremake v4l-dvb                        KCFG="-rpi"
+#    ipfiremake kvm-kmod                       KCFG="-rpi"
+#    ipfiremake mISDN                  KCFG="-rpi"
+#    ipfiremake dahdi                  KCFG="-rpi" KMOD=1
+    ipfiremake cryptodev               KCFG="-rpi"
+#    ipfiremake compat-wireless                KCFG="-rpi"
+#    ipfiremake r8169                  KCFG="-rpi"
+#    ipfiremake r8168                  KCFG="-rpi"
+#    ipfiremake r8101                  KCFG="-rpi"
+#    ipfiremake e1000                  KCFG="-rpi"
+#    ipfiremake e1000e                 KCFG="-rpi"
+#    ipfiremake igb                    KCFG="-rpi"
 
     ipfiremake linux                   KCFG="-omap"
+#    ipfiremake v4l-dvb                        KCFG="-omap"
+#    ipfiremake kvm-kmod                       KCFG="-omap"
+#    ipfiremake mISDN                  KCFG="-omap"
+#    ipfiremake dahdi                  KCFG="-omap" KMOD=1
+    ipfiremake cryptodev               KCFG="-omap"
+#    ipfiremake compat-wireless                KCFG="-omap"
+#    ipfiremake r8169                  KCFG="-omap"
+#    ipfiremake r8168                  KCFG="-omap"
+#    ipfiremake r8101                  KCFG="-omap"
+#    ipfiremake e1000                  KCFG="-omap"
+#    ipfiremake e1000e                 KCFG="-omap"
+#    ipfiremake igb                    KCFG="-omap"
 
     # arm-versatile kernel build
     ipfiremake linux                   KCFG="-versatile"
@@ -1021,9 +1042,7 @@ toolchain)
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | 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-$MACHINE.tar.gz \
-               build/{bin,etc,usr/bin,usr/local} \
-               build/tools/{bin,etc,*-linux-gnu*,include,lib,libexec,sbin,share,var} \
-               log >> $LOGFILE
+               build/tools log >> $LOGFILE
        md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
                > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5
        stdumount