From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 31 Oct 2018 17:44:43 +0000 (+0100)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.21-core125~25^2~8
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a4e5b80b91132e324e8c1caee1abb2e43a8ee706;hp=-c

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

a4e5b80b91132e324e8c1caee1abb2e43a8ee706
diff --combined make.sh
index d23d575358,129bf6f7b5..89ada46799
--- a/make.sh
+++ b/make.sh
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  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
  
  ###############################################################################
  #
@@@ -1176,6 -1176,7 +1176,7 @@@ buildipfire() 
    lfsmake2 libgcrypt
    lfsmake2 libassuan
    lfsmake2 nettle
+   lfsmake2 json-c
    lfsmake2 libevent
    lfsmake2 libevent2
    lfsmake2 expat
@@@ -1556,6 -1557,7 +1557,7 @@@
    lfsmake2 lua
    lfsmake2 dnsdist
    lfsmake2 bird
+   lfsmake2 frr
    lfsmake2 dmidecode
    lfsmake2 mcelog
    lfsmake2 rtpproxy