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

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

diff --git a/make.sh b/make.sh
index e803ce3c094a067cb5f2ece04a4b58c4883db0ce..6585dd13a1a1a11d9b62625b2539690e71569cba 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="110"                                                     # Core Level (Filename)
+CORE="111"                                                     # Core Level (Filename)
 PAKFIRE_CORE="110"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -36,7 +36,8 @@ 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=12
+
+TOOLCHAINVER=20170518
 
 # New architecture variables
 HOST_ARCH="$(uname -m)"
@@ -340,9 +341,9 @@ buildbase() {
     lfsmake2 file
     lfsmake2 gcc
     lfsmake2 sed
-    lfsmake2 berkeley
     lfsmake2 autoconf
     lfsmake2 automake
+    lfsmake2 berkeley
     lfsmake2 coreutils
     lfsmake2 iana-etc
     lfsmake2 m4
@@ -493,6 +494,7 @@ buildipfire() {
   lfsmake2 nettle
   lfsmake2 libevent
   lfsmake2 libevent2
+  lfsmake2 libevent2-compat
   lfsmake2 expat
   lfsmake2 unbound
   lfsmake2 gnutls
@@ -651,8 +653,8 @@ buildipfire() {
   lfsmake2 intltool
   lfsmake2 libdaemon
   lfsmake2 cups
-  lfsmake2 ghostscript
   lfsmake2 lcms2
+  lfsmake2 ghostscript
   lfsmake2 qpdf
   lfsmake2 poppler
   lfsmake2 cups-filters
@@ -737,12 +739,10 @@ buildipfire() {
   lfsmake2 icinga
   lfsmake2 ebtables
   lfsmake2 directfb
-  lfsmake2 dfb++
   lfsmake2 faad2
   lfsmake2 ffmpeg
   lfsmake2 vdr
   lfsmake2 vdr_streamdev
-  lfsmake2 vdr_vnsiserver5
   lfsmake2 vdr_epgsearch
   lfsmake2 vdr_dvbapi
   lfsmake2 vdr_eepg
@@ -791,7 +791,6 @@ buildipfire() {
   lfsmake2 cacti
   lfsmake2 openvmtools
   lfsmake2 nagiosql
-  lfsmake2 iftop
   lfsmake2 motion
   lfsmake2 joe
   lfsmake2 monit
@@ -807,7 +806,6 @@ buildipfire() {
   lfsmake2 pound
   lfsmake2 minicom
   lfsmake2 ddrescue
-  lfsmake2 imspector
   lfsmake2 miniupnpd
   lfsmake2 client175
   lfsmake2 powertop
@@ -826,7 +824,6 @@ buildipfire() {
   lfsmake2 dpfhack
   lfsmake2 lcd4linux
   lfsmake2 mtr
-  lfsmake2 tcpick
   lfsmake2 minidlna
   lfsmake2 acpid
   lfsmake2 fping
@@ -885,6 +882,7 @@ buildipfire() {
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
+  lfsmake2 python3-libvirt
   lfsmake2 freeradius
   lfsmake2 perl-common-sense
   lfsmake2 perl-inotify2
@@ -897,7 +895,7 @@ buildinstaller() {
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
-  installmake strip
+  lfsmake2 strip
 }
 
 buildpackages() {
@@ -995,7 +993,7 @@ ipfirepackages() {
 while [ $# -gt 0 ]; do
        case "${1}" in
                --target=*)
-                       configure_target "${1#--target=}"
+                       configure_build "${1#--target=}"
                        ;;
                -*)
                        exiterror "Unknown configuration option: ${1}"