Merge remote-tracking branch 'origin/next' into kernel-update

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

diff --git a/make.sh b/make.sh
index b1b8514daca8b1cc0d4a2ffb90c23eee77d9817c..b0a692c218415fce1c75b60011f4f7b654b3db7c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.11"                                                 # Version number
-CORE="59"                                                      # Core Level (Filename)
-PAKFIRE_CORE="58"                                              # Core Level (PAKFIRE)
+CORE="62"                                                      # Core Level (Filename)
+PAKFIRE_CORE="61"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -265,11 +265,7 @@ buildtoolchain() {
     lfsmake1 binutils  PASS=1
     lfsmake1 gcc               PASS=1
     export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
-    if [ "${MACHINE_TYPE}" = "arm" ]; then
-        lfsmake1 linux TOOLS=1 HEADERS=1
-    else
-        lfsmake1 linux-libc-header
-    fi
+    lfsmake1 linux2 TOOLS=1 HEADERS=1
     lfsmake1 glibc
     lfsmake1 cleanup-toolchain PASS=1
     lfsmake1 fake-environ
@@ -306,11 +302,7 @@ buildbase() {
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2
-    if [ "${MACHINE_TYPE}" = "arm" ]; then
-        lfsmake2 linux HEADERS=1
-    else
-        lfsmake2 linux-libc-header
-    fi
+    lfsmake2 linux2 HEADERS=1
     lfsmake2 man-pages
     lfsmake2 glibc
     lfsmake2 tzdata
@@ -384,12 +376,13 @@ buildipfire() {
   ipfiremake xz
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
+  ipfiremake rpi-firmware
   ipfiremake fw_ath9k_htc
   ipfiremake u-boot
 
   # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake linux                   KCFG="-xen"
+    ipfiremake linux2                  KCFG="-xen"
     ipfiremake kqemu                   KCFG="-xen"
     ipfiremake v4l-dvb                 KCFG="-xen"
     ipfiremake madwifi                 KCFG="-xen"
@@ -403,6 +396,7 @@ buildipfire() {
     ipfiremake e1000                   KCFG="-xen"
     ipfiremake e1000e                  KCFG="-xen"
     ipfiremake igb                     KCFG="-xen"
+
     ipfiremake linux                   KCFG="-pae"
     ipfiremake kqemu                   KCFG="-pae"
     ipfiremake kvm-kmod                        KCFG="-pae"
@@ -419,6 +413,7 @@ buildipfire() {
     ipfiremake e1000                   KCFG="-pae"
     ipfiremake e1000e                  KCFG="-pae"
     ipfiremake igb                     KCFG="-pae"
+
     ipfiremake linux                   KCFG=""
     ipfiremake v4l-dvb                 KCFG=""
     ipfiremake kqemu                   KCFG=""
@@ -437,6 +432,8 @@ buildipfire() {
     ipfiremake igb                     KCFG=""
   else
     # arm-omap kernel build
+    ipfiremake linux3                  KCFG="-rpi"
+
     ipfiremake linux3                  KCFG="-omap"
 
     # arm-versatile kernel build
@@ -768,6 +765,8 @@ buildipfire() {
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux
+  ipfiremake mtr
+  ipfiremake tcpick
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild