Merge remote-tracking branch 'origin/next' into thirteen

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

diff --git a/make.sh b/make.sh
index 07e93deb18d49a93a535d95e92f977af86061468..b0f8b31b26cdd2565901c86f273f3189057fdacb 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.11"                                                 # Version number
-CORE="62"                                                      # Core Level (Filename)
-PAKFIRE_CORE="61"                                              # Core Level (PAKFIRE)
+VERSION="2.13"                                                 # Version number
+CORE="63"                                                      # Core Level (Filename)
+PAKFIRE_CORE="63"                                              # 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
@@ -362,6 +362,7 @@ buildipfire() {
   export LOGFILE
   ipfiremake configroot
   ipfiremake backup
+  ipfiremake bind
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake libusb
@@ -373,15 +374,13 @@ buildipfire() {
   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 linux2                  KCFG="-xen"
-#    ipfiremake v4l-dvb                        KCFG="-xen"
+    ipfiremake v4l-dvb                 KCFG="-xen"
 #    ipfiremake mISDN                  KCFG="-xen"
-    ipfiremake dahdi                   KCFG="-xen" KMOD=1
     ipfiremake cryptodev               KCFG="-xen"
     ipfiremake compat-wireless         KCFG="-xen"
 #    ipfiremake r8169                  KCFG="-xen"
@@ -393,10 +392,9 @@ buildipfire() {
 
     ipfiremake linux                   KCFG="-pae"
 #    ipfiremake kvm-kmod                       KCFG="-pae"
-#    ipfiremake v4l-dvb                        KCFG="-pae"
+    ipfiremake v4l-dvb                 KCFG="-pae"
     ipfiremake alsa                    KCFG="-pae" KMOD=1
 #    ipfiremake mISDN                  KCFG="-pae"
-    ipfiremake dahdi                   KCFG="-pae" KMOD=1
     ipfiremake cryptodev               KCFG="-pae"
     ipfiremake compat-wireless         KCFG="-pae"
 #    ipfiremake r8169                  KCFG="-pae"
@@ -408,10 +406,9 @@ buildipfire() {
 
     ipfiremake linux                   KCFG=""
 #    ipfiremake kvm-kmod                       KCFG=""
-#    ipfiremake v4l-dvb                        KCFG=""
+    ipfiremake v4l-dvb                 KCFG=""
     ipfiremake alsa                    KCFG="" KMOD=1
 #    ipfiremake mISDN                  KCFG=""
-    ipfiremake dahdi                   KCFG="" KMOD=1
     ipfiremake cryptodev               KCFG=""
     ipfiremake compat-wireless         KCFG=""
 #    ipfiremake r8169                  KCFG=""
@@ -424,10 +421,9 @@ buildipfire() {
   else
     # arm-omap kernel build
     ipfiremake linux                   KCFG="-rpi"
-#    ipfiremake v4l-dvb                        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"
@@ -438,10 +434,9 @@ buildipfire() {
 #    ipfiremake igb                    KCFG="-rpi"
 
     ipfiremake linux                   KCFG="-omap"
-#    ipfiremake v4l-dvb                        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"
@@ -453,10 +448,9 @@ buildipfire() {
 
     # arm-kirkwood kernel build
     ipfiremake linux                   KCFG="-kirkwood"
-#    ipfiremake v4l-dvb                        KCFG="-kirkwood"
+    ipfiremake v4l-dvb                 KCFG="-kirkwood"
 #    ipfiremake kvm-kmod                       KCFG="-kirkwood"
 #    ipfiremake mISDN                  KCFG="-kirkwood"
-#    ipfiremake dahdi                  KCFG="-kirkwood" KMOD=1
     ipfiremake cryptodev               KCFG="-kirkwood"
     ipfiremake compat-wireless         KCFG="-kirkwood"
 #    ipfiremake r8169                  KCFG="-kirkwood"
@@ -465,6 +459,7 @@ buildipfire() {
 #    ipfiremake e1000                  KCFG="-kirkwood"
 #    ipfiremake e1000e                 KCFG="-kirkwood"
 #    ipfiremake igb                    KCFG="-kirkwood"
+
   fi
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -509,7 +504,6 @@ buildipfire() {
   ipfiremake apache2                   PASS=C
   ipfiremake arping
   ipfiremake beep
-  ipfiremake bind
   ipfiremake dvdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
@@ -582,6 +576,7 @@ buildipfire() {
   ipfiremake ntp
   ipfiremake openssh
   ipfiremake fontconfig
+  ipfiremake dejavu-fonts-ttf
   ipfiremake freefont
   ipfiremake pixman
   ipfiremake cairo
@@ -730,7 +725,6 @@ buildipfire() {
   ipfiremake nut
   ipfiremake watchdog
   ipfiremake libpri
-  ipfiremake dahdi
   ipfiremake asterisk
   ipfiremake lcr
   ipfiremake usb_modeswitch
@@ -764,6 +758,8 @@ buildipfire() {
   ipfiremake tcpick
   ipfiremake minidlna
   ipfiremake acpid
+  ipfiremake fping
+  ipfiremake telnet
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild