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

diff --combined make.sh
index 7cd9f4d07f2c08a69d4ad60ab270aaad3ee05115,89f979d95b7ec36b8112595900c89a10640b44ef..f724a3540d495654034de1dcd3845210ce84a91f
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -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,7 -384,6 +384,7 @@@ buildipfire() 
    ipfiremake xz
    ipfiremake linux-firmware
    ipfiremake zd1211-firmware
 +  ipfiremake rpi-firmware
    ipfiremake fw_ath9k_htc
    ipfiremake u-boot
  
@@@ -437,11 -436,6 +437,11 @@@
      ipfiremake e1000e                 KCFG=""
      ipfiremake igb                    KCFG=""
    else
 +    # arm-omap kernel build
 +    ipfiremake linux-rpi              KCFG="-rpi"
 +
 +    ipfiremake linux3                 KCFG="-omap"
 +
      # arm-versatile kernel build
      ipfiremake linux                  KCFG="-versatile"
      ipfiremake v4l-dvb                        KCFG="-versatile"
@@@ -771,6 -765,8 +771,8 @@@
    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