Merge branch 'unbound' into next

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

diff --git a/make.sh b/make.sh
index 39089cd88785b7d1441b46e62b169f32fc8c4444..73feacb37d4945a4292099103c17497c2768d765 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,16 +17,16 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.17"                                                 # Version number
-CORE="96"                                                      # Core Level (Filename)
-PAKFIRE_CORE="96"                                              # Core Level (PAKFIRE)
+VERSION="2.19"                                                 # Version number
+CORE="104"                                                     # Core Level (Filename)
+PAKFIRE_CORE="104"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -36,7 +36,7 @@ BUILD_IMAGES=1                                                        # Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=10
+TOOLCHAINVER=12
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"
@@ -221,7 +221,7 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}"
+    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${TARGET_ARCH}"
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
     rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
@@ -260,7 +260,7 @@ buildtoolchain() {
             ;;
 
         # ARM
-        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l)
+        armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l|armv5tel:aarch64)
             # These are working.
             ;;
         armv5tel:*)
@@ -287,12 +287,14 @@ buildtoolchain() {
     lfsmake1 linux                     TOOLS=1 KCFG="-headers"
     lfsmake1 glibc
     lfsmake1 cleanup-toolchain         PASS=1
+    lfsmake1 gcc                       PASS=L
     lfsmake1 binutils                  PASS=2
     lfsmake1 gcc                       PASS=2
     lfsmake1 ccache                    PASS=2
     lfsmake1 tcl
     lfsmake1 expect
     lfsmake1 dejagnu
+    lfsmake1 pkg-config
     lfsmake1 ncurses
     lfsmake1 bash
     lfsmake1 bzip2
@@ -330,26 +332,28 @@ buildbase() {
     lfsmake2 gmp
     lfsmake2 gmp-compat
     lfsmake2 mpfr
+    lfsmake2 libmpc
     lfsmake2 file
     lfsmake2 gcc
     lfsmake2 sed
     lfsmake2 berkeley
+    lfsmake2 autoconf
+    lfsmake2 automake
     lfsmake2 coreutils
     lfsmake2 iana-etc
     lfsmake2 m4
     lfsmake2 bison
+    lfsmake2 ncurses-compat
     lfsmake2 ncurses
     lfsmake2 procps
     lfsmake2 libtool
     lfsmake2 perl
     lfsmake2 readline
     lfsmake2 readline-compat
+    lfsmake2 bzip2
     lfsmake2 pcre
     lfsmake2 pcre-compat
-    lfsmake2 autoconf
-    lfsmake2 automake
     lfsmake2 bash
-    lfsmake2 bzip2
     lfsmake2 diffutils
     lfsmake2 e2fsprogs
     lfsmake2 ed
@@ -398,7 +402,9 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake which
   ipfiremake linux-firmware
+  ipfiremake ath10k-firmware
   ipfiremake dvb-firmwares
+  ipfiremake mt7601u-firmware
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
   ipfiremake bc
@@ -531,7 +537,9 @@ buildipfire() {
   ipfiremake beep
   ipfiremake dvdrtools
   ipfiremake nettle
-  ipfiremake dnsmasq
+  ipfiremake libevent
+  ipfiremake libevent2
+  ipfiremake unbound
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake xfsprogs
@@ -546,6 +554,7 @@ buildipfire() {
   ipfiremake GD-TextUtil
   ipfiremake perl-Device-SerialPort
   ipfiremake perl-Device-Modem
+  ipfiremake perl-Apache-Htpasswd
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake sdparm
@@ -596,6 +605,9 @@ buildipfire() {
   ipfiremake python-mechanize
   ipfiremake python-feedparser
   ipfiremake python-rssdler
+  ipfiremake python-inotify
+  ipfiremake python-docutils
+  ipfiremake python-daemon
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -671,10 +683,11 @@ buildipfire() {
   ipfiremake gnump3d
   ipfiremake rsync
   ipfiremake tcpwrapper
-  ipfiremake libevent
-  ipfiremake libevent2
-  ipfiremake portmap
+  ipfiremake libtirpc
+  ipfiremake rpcbind
   ipfiremake nfs
+  ipfiremake gnu-netcat
+  ipfiremake ncat
   ipfiremake nmap
   ipfiremake ncftp
   ipfiremake etherwake
@@ -692,7 +705,13 @@ buildipfire() {
   ipfiremake elinks
   ipfiremake igmpproxy
   ipfiremake fbset
+  ipfiremake opus
+  ipfiremake python-six
+  ipfiremake python-pyparsing
+  ipfiremake spice-protocol
+  ipfiremake spice
   ipfiremake sdl
+  ipfiremake libusbredir
   ipfiremake qemu
   ipfiremake sane
   ipfiremake netpbm
@@ -740,13 +759,13 @@ buildipfire() {
   ipfiremake gutenprint
   ipfiremake apcupsd
   ipfiremake iperf
-  ipfiremake netcat
+  ipfiremake iperf3
   ipfiremake 7zip
   ipfiremake lynis
   ipfiremake streamripper
   ipfiremake sshfs
   ipfiremake taglib
-  ipfiremake mediatomb
+  #ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake perl-Sort-Naturally
@@ -844,6 +863,20 @@ buildipfire() {
   ipfiremake swconfig
   ipfiremake haproxy
   ipfiremake ipset
+  ipfiremake lua
+  ipfiremake dnsdist
+  ipfiremake bird
+  ipfiremake dmidecode
+  ipfiremake mcelog
+  ipfiremake rtpproxy
+  ipfiremake util-macros
+  ipfiremake libpciaccess
+  ipfiremake libyajl
+  ipfiremake libvirt
+  ipfiremake freeradius
+  ipfiremake perl-common-sense
+  ipfiremake perl-inotify2
+  ipfiremake perl-Net-IP
 }
 
 buildinstaller() {