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 b9558bc0427864ab3177c1da811a8767ecd3d8f9..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=20181024
+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() {
@@ -1177,6 +1176,7 @@ buildipfire() {
   lfsmake2 libgcrypt
   lfsmake2 libassuan
   lfsmake2 nettle
+  lfsmake2 json-c
   lfsmake2 libevent
   lfsmake2 libevent2
   lfsmake2 expat
@@ -1557,6 +1557,7 @@ buildipfire() {
   lfsmake2 lua
   lfsmake2 dnsdist
   lfsmake2 bird
+  lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
   lfsmake2 rtpproxy