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 9b27f059bdb393266d4205e1b9dad4c640cdb0c1..2c52ad16128cb78120f30067c6533504d43e17ca 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="59"                                              # Core Level (PAKFIRE)
+CORE="61"                                                      # Core Level (Filename)
+PAKFIRE_CORE="60"                                              # 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
@@ -384,6 +384,7 @@ buildipfire() {
   ipfiremake xz
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
+  ipfiremake rpi-firmware
   ipfiremake fw_ath9k_htc
   ipfiremake u-boot
 
@@ -436,6 +437,11 @@ buildipfire() {
     ipfiremake e1000e                  KCFG=""
     ipfiremake igb                     KCFG=""
   else
+    # arm-omap kernel build
+    ipfiremake linux3                  KCFG="-rpi"
+
+    ipfiremake linux3                  KCFG="-omap"
+
     # arm-versatile kernel build
     ipfiremake linux                   KCFG="-versatile"
     ipfiremake v4l-dvb                 KCFG="-versatile"
@@ -765,6 +771,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