Merge branch 'next' into kernel-4.9

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

diff --git a/make.sh b/make.sh
index 4a4491eda68934bcbd0f29cb1edca74bf99eb764..89c3e56cafaba1c0df9b6fc3f6501ce10e755507 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="110"                                                     # Core Level (Filename)
-PAKFIRE_CORE="110"                                             # Core Level (PAKFIRE)
+CORE="112"                                                     # Core Level (Filename)
+PAKFIRE_CORE="112"                                             # 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,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=20170705
 
 # New architecture variables
 HOST_ARCH="$(uname -m)"
@@ -389,6 +390,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 vim
     lfsmake2 xz
+    lfsmake2 paxctl
 }
 
 buildipfire() {
@@ -431,29 +433,29 @@ buildipfire() {
   case "${BUILD_ARCH}" in
        x86_64)
                lfsmake2 linux                  KCFG=""
-               lfsmake2 backports                      KCFG=""
-               lfsmake2 e1000e                 KCFG=""
-               lfsmake2 igb                            KCFG=""
-               lfsmake2 ixgbe                  KCFG=""
+#              lfsmake2 backports                      KCFG=""
+#              lfsmake2 e1000e                 KCFG=""
+#              lfsmake2 igb                            KCFG=""
+#              lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
                lfsmake2 linux                  KCFG="-pae"
-               lfsmake2 backports                      KCFG="-pae"
-               lfsmake2 e1000e                 KCFG="-pae"
-               lfsmake2 igb                            KCFG="-pae"
-               lfsmake2 ixgbe                  KCFG="-pae"
+#              lfsmake2 backports                      KCFG="-pae"
+#              lfsmake2 e1000e                 KCFG="-pae"
+#              lfsmake2 igb                            KCFG="-pae"
+#              lfsmake2 ixgbe                  KCFG="-pae"
                lfsmake2 xtables-addons         KCFG="-pae"
                lfsmake2 linux-initrd                   KCFG="-pae"
 
                # x86 kernel build
                lfsmake2 linux                  KCFG=""
-               lfsmake2 backports                      KCFG=""
-               lfsmake2 e1000e                 KCFG=""
-               lfsmake2 igb                            KCFG=""
-               lfsmake2 ixgbe                  KCFG=""
+#              lfsmake2 backports                      KCFG=""
+#              lfsmake2 e1000e                 KCFG=""
+#              lfsmake2 igb                            KCFG=""
+#              lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
@@ -493,6 +495,7 @@ buildipfire() {
   lfsmake2 nettle
   lfsmake2 libevent
   lfsmake2 libevent2
+  lfsmake2 libevent2-compat
   lfsmake2 expat
   lfsmake2 unbound
   lfsmake2 gnutls
@@ -524,7 +527,6 @@ buildipfire() {
   lfsmake2 libart
   lfsmake2 gd
   lfsmake2 popt
-  lfsmake2 pcre
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
@@ -617,7 +619,6 @@ buildipfire() {
   lfsmake2 python-ipaddress
   lfsmake2 glib
   lfsmake2 GeoIP
-  lfsmake2 fwhits
   lfsmake2 noip_updater
   lfsmake2 ntp
   lfsmake2 openssh
@@ -651,8 +652,8 @@ buildipfire() {
   lfsmake2 intltool
   lfsmake2 libdaemon
   lfsmake2 cups
-  lfsmake2 ghostscript
   lfsmake2 lcms2
+  lfsmake2 ghostscript
   lfsmake2 qpdf
   lfsmake2 poppler
   lfsmake2 cups-filters
@@ -703,7 +704,6 @@ buildipfire() {
   lfsmake2 gnu-netcat
   lfsmake2 ncat
   lfsmake2 nmap
-  lfsmake2 ncftp
   lfsmake2 etherwake
   lfsmake2 bwm-ng
   lfsmake2 sysstat
@@ -737,12 +737,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 +789,6 @@ buildipfire() {
   lfsmake2 cacti
   lfsmake2 openvmtools
   lfsmake2 nagiosql
-  lfsmake2 iftop
   lfsmake2 motion
   lfsmake2 joe
   lfsmake2 monit
@@ -807,7 +804,6 @@ buildipfire() {
   lfsmake2 pound
   lfsmake2 minicom
   lfsmake2 ddrescue
-  lfsmake2 imspector
   lfsmake2 miniupnpd
   lfsmake2 client175
   lfsmake2 powertop
@@ -884,6 +880,7 @@ buildipfire() {
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
+  lfsmake2 python3-libvirt
   lfsmake2 freeradius
   lfsmake2 perl-common-sense
   lfsmake2 perl-inotify2
@@ -896,7 +893,7 @@ buildinstaller() {
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
-  lfsmake2 strip
+  lfsmake1 strip
 }
 
 buildpackages() {
@@ -994,7 +991,7 @@ ipfirepackages() {
 while [ $# -gt 0 ]; do
        case "${1}" in
                --target=*)
-                       configure_target "${1#--target=}"
+                       configure_build "${1#--target=}"
                        ;;
                -*)
                        exiterror "Unknown configuration option: ${1}"
@@ -1015,7 +1012,7 @@ build)
        #only restore on a clean disk
        if [ ! -e "${BASEDIR}/build/tools/.toolchain-successful" ]; then
                if [ ! -n "$PACKAGE" ]; then
-                       beautify build_stage "Full toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
+                       beautify build_stage "Full toolchain compilation"
                        prepareenv
                        buildtoolchain
                else
@@ -1144,7 +1141,7 @@ downloadsrc)
 toolchain)
        clear
        prepareenv
-       beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
+       beautify build_stage "Toolchain compilation"
        buildtoolchain
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for ${BUILD_ARCH}" | tee -a $LOGFILE
        test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains