Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

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

diff --git a/make.sh b/make.sh
index c811f05731daa7118b445d9d4342c2aa274c420c..89ada46799b32f5f0fb02bfcb958e44c466b6e9a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ 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=20180606
+TOOLCHAINVER=20181030
 
 ###############################################################################
 #
@@ -1039,6 +1039,7 @@ buildbase() {
        lfsmake2 readline
        lfsmake2 readline-compat
        lfsmake2 bzip2
+       lfsmake2 xz
        lfsmake2 pcre
        lfsmake2 pcre-compat
        lfsmake2 bash
@@ -1073,8 +1074,6 @@ buildbase() {
        lfsmake2 util-linux
        lfsmake2 udev
        lfsmake2 vim
-       lfsmake2 xz
-       lfsmake2 paxctl
 }
 
 buildipfire() {
@@ -1083,6 +1082,9 @@ buildipfire() {
   lfsmake2 configroot
   lfsmake2 initscripts
   lfsmake2 backup
+  lfsmake2 openssl
+  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+  lfsmake2 openssl-compat
   lfsmake2 popt
   lfsmake2 libusb
   lfsmake2 libusb-compat
@@ -1101,6 +1103,7 @@ buildipfire() {
   lfsmake2 cpio
   lfsmake2 mdadm
   lfsmake2 dracut
+  lfsmake2 libaio
   lfsmake2 lvm2
   lfsmake2 multipath-tools
   lfsmake2 freetype
@@ -1169,13 +1172,11 @@ buildipfire() {
   esac
   lfsmake2 intel-microcode
   lfsmake2 xtables-addons                      USPACE="1"
-  lfsmake2 openssl
-  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
-  lfsmake2 openssl-compat
   lfsmake2 libgpg-error
   lfsmake2 libgcrypt
   lfsmake2 libassuan
   lfsmake2 nettle
+  lfsmake2 json-c
   lfsmake2 libevent
   lfsmake2 libevent2
   lfsmake2 expat
@@ -1378,6 +1379,7 @@ buildipfire() {
   lfsmake2 rsync
   lfsmake2 libtirpc
   lfsmake2 rpcbind
+  lfsmake2 keyutils
   lfsmake2 nfs
   lfsmake2 gnu-netcat
   lfsmake2 ncat
@@ -1555,6 +1557,7 @@ buildipfire() {
   lfsmake2 lua
   lfsmake2 dnsdist
   lfsmake2 bird
+  lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
   lfsmake2 rtpproxy