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 1e08be6d34c77aa4478d838dc2e93c326835921f..b0f8b31b26cdd2565901c86f273f3189057fdacb 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="62"                                                      # Core Level (Filename)
-PAKFIRE_CORE="62"                                              # Core Level (PAKFIRE)
+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,7 +374,6 @@ 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
@@ -421,7 +421,7 @@ 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 cryptodev               KCFG="-rpi"
@@ -434,7 +434,7 @@ 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 cryptodev               KCFG="-omap"
@@ -448,7 +448,7 @@ 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 cryptodev               KCFG="-kirkwood"
@@ -504,7 +504,6 @@ buildipfire() {
   ipfiremake apache2                   PASS=C
   ipfiremake arping
   ipfiremake beep
-  ipfiremake bind
   ipfiremake dvdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
@@ -760,6 +759,7 @@ buildipfire() {
   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