Merge branch 'next' into initscripts-cleanup

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

diff --git a/make.sh b/make.sh
index e8def816cda36ced5a1eb56a2f2e81662b1f0851..f5e792a9a91855b62f946e0c983e8102ffa23a4a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
 # 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-2016 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="101"                                                     # Core Level (Filename)
-PAKFIRE_CORE="100"                                             # Core Level (PAKFIRE)
+CORE="110"                                                     # Core Level (Filename)
+PAKFIRE_CORE="109"                                             # 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=11
+TOOLCHAINVER=12
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"
@@ -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:*)
@@ -294,9 +294,11 @@ buildtoolchain() {
     lfsmake1 tcl
     lfsmake1 expect
     lfsmake1 dejagnu
+    lfsmake1 pkg-config
     lfsmake1 ncurses
     lfsmake1 bash
     lfsmake1 bzip2
+    lfsmake1 automake
     lfsmake1 coreutils
     lfsmake1 diffutils
     lfsmake1 findutils
@@ -336,22 +338,23 @@ buildbase() {
     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
@@ -484,12 +487,17 @@ buildipfire() {
   ipfiremake libgpg-error
   ipfiremake libgcrypt
   ipfiremake libassuan
+  ipfiremake nettle
+  ipfiremake libevent
+  ipfiremake libevent2
+  ipfiremake expat
+  ipfiremake unbound
+  ipfiremake gnutls
   ipfiremake bind
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake boost
   ipfiremake linux-atm
-  ipfiremake expat
   ipfiremake gdbm
   ipfiremake pam
   ipfiremake curl
@@ -497,6 +505,7 @@ buildipfire() {
   ipfiremake sqlite
   ipfiremake libffi
   ipfiremake python
+  ipfiremake python3
   ipfiremake ca-certificates
   ipfiremake fireinfo
   ipfiremake libnet
@@ -505,6 +514,7 @@ buildipfire() {
   ipfiremake libidn
   ipfiremake nasm
   ipfiremake libjpeg
+  ipfiremake libjpeg-compat
   ipfiremake libexif
   ipfiremake libpng
   ipfiremake libtiff
@@ -534,8 +544,6 @@ buildipfire() {
   ipfiremake arping
   ipfiremake beep
   ipfiremake dvdrtools
-  ipfiremake nettle
-  ipfiremake dnsmasq
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake xfsprogs
@@ -601,6 +609,10 @@ buildipfire() {
   ipfiremake python-mechanize
   ipfiremake python-feedparser
   ipfiremake python-rssdler
+  ipfiremake python-inotify
+  ipfiremake python-docutils
+  ipfiremake python-daemon
+  ipfiremake python-ipaddress
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -634,8 +646,16 @@ buildipfire() {
   ipfiremake pammysql
   ipfiremake mpage
   ipfiremake dbus
+  ipfiremake intltool
+  ipfiremake libdaemon
+  ipfiremake avahi
   ipfiremake cups
   ipfiremake ghostscript
+  ipfiremake lcms2
+  ipfiremake qpdf
+  ipfiremake poppler
+  ipfiremake cups-filters
+  ipfiremake epson-inkjet-printer-escpr
   ipfiremake foomatic
   ipfiremake hplip
   ipfiremake cifs-utils
@@ -676,9 +696,8 @@ buildipfire() {
   ipfiremake gnump3d
   ipfiremake rsync
   ipfiremake tcpwrapper
-  ipfiremake libevent
-  ipfiremake libevent2
-  ipfiremake portmap
+  ipfiremake libtirpc
+  ipfiremake rpcbind
   ipfiremake nfs
   ipfiremake gnu-netcat
   ipfiremake ncat
@@ -705,6 +724,7 @@ buildipfire() {
   ipfiremake spice-protocol
   ipfiremake spice
   ipfiremake sdl
+  ipfiremake libusbredir
   ipfiremake qemu
   ipfiremake sane
   ipfiremake netpbm
@@ -722,7 +742,6 @@ buildipfire() {
   ipfiremake vdr
   ipfiremake vdr_streamdev
   ipfiremake vdr_vnsiserver5
-  ipfiremake vdr_vnsiserver3
   ipfiremake vdr_epgsearch
   ipfiremake vdr_dvbapi
   ipfiremake vdr_eepg
@@ -801,7 +820,6 @@ buildipfire() {
   ipfiremake python-lzma
   ipfiremake python-progressbar
   ipfiremake python-xattr
-  ipfiremake intltool
   ipfiremake ddns
   ipfiremake transmission
   ipfiremake dpfhack
@@ -820,8 +838,6 @@ buildipfire() {
   ipfiremake libstatgrab
   ipfiremake sarg
   ipfiremake check_mk_agent
-  ipfiremake libdaemon
-  ipfiremake avahi
   ipfiremake nginx
   ipfiremake sendEmail
   ipfiremake sysbench
@@ -861,6 +877,15 @@ buildipfire() {
   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() {