X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=83dd9b1213e9c44b235b3f311e0b2cf764297ea3;hb=ede4314397661889ce05f6a9d4dcdd5cc88ffb40;hp=5276c8fe48313875b17acdd2f55b1e9991952bbf;hpb=aba59b7c7664f83e0b07a8fa0dc1f133d3fe55d3;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 5276c8fe48..83dd9b1213 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.21"							# Version number
-CORE="125"							# Core Level (Filename)
-PAKFIRE_CORE="124"						# Core Level (PAKFIRE)
+CORE="126"							# Core Level (Filename)
+PAKFIRE_CORE="126"						# 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
@@ -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
 
 ###############################################################################
 #
@@ -253,7 +253,10 @@ configure_build() {
 
 configure_build_guess() {
 	case "${HOST_ARCH}" in
-		x86_64|i686|i586)
+		x86_64)
+			echo "x86_64"
+			;;
+		i?86)
 			echo "i586"
 			;;
 
@@ -1039,6 +1042,7 @@ buildbase() {
 	lfsmake2 readline
 	lfsmake2 readline-compat
 	lfsmake2 bzip2
+	lfsmake2 xz
 	lfsmake2 pcre
 	lfsmake2 pcre-compat
 	lfsmake2 bash
@@ -1073,8 +1077,6 @@ buildbase() {
 	lfsmake2 util-linux
 	lfsmake2 udev
 	lfsmake2 vim
-	lfsmake2 xz
-	lfsmake2 paxctl
 }
 
 buildipfire() {
@@ -1177,6 +1179,8 @@ buildipfire() {
   lfsmake2 libgcrypt
   lfsmake2 libassuan
   lfsmake2 nettle
+  lfsmake2 json-c
+  lfsmake2 libconfig
   lfsmake2 libevent
   lfsmake2 libevent2
   lfsmake2 expat
@@ -1372,6 +1376,7 @@ buildipfire() {
   lfsmake2 flac
   lfsmake2 lame
   lfsmake2 sox
+  lfsmake2 soxr
   lfsmake2 libshout
   lfsmake2 xvid
   lfsmake2 libmpeg2
@@ -1412,9 +1417,11 @@ buildipfire() {
   lfsmake2 nagios_nrpe
   lfsmake2 nagios-plugins
   lfsmake2 icinga
+  lfsmake2 observium-agent
   lfsmake2 ebtables
   lfsmake2 directfb
   lfsmake2 faad2
+  lfsmake2 alac
   lfsmake2 ffmpeg
   lfsmake2 vdr
   lfsmake2 vdr_streamdev
@@ -1557,6 +1564,7 @@ buildipfire() {
   lfsmake2 lua
   lfsmake2 dnsdist
   lfsmake2 bird
+  lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
   lfsmake2 rtpproxy
@@ -1573,6 +1581,8 @@ buildipfire() {
   lfsmake2 mdns-repeater
   lfsmake2 i2c-tools
   lfsmake2 nss-myhostname
+  lfsmake2 dehydrated
+  lfsmake2 shairport-sync
 }
 
 buildinstaller() {
@@ -1761,6 +1771,20 @@ clean)
 	rm -f $BASEDIR/ipfire-*
 	print_status DONE
 	;;
+docker)
+	# Build the docker image if it does not exist, yet
+	if ! docker images -a | grep -q ^ipfire-builder; then
+		if docker build -t ipfire-builder ${BASEDIR}/tools/docker; then
+			print_status DONE
+		else
+			print_status FAIL
+			exit 1
+		fi
+	fi
+
+	# Run the container and enter a shell
+	docker run -it --privileged -v "${BASEDIR}:/build" -w "/build" ipfire-builder bash -l
+	;;
 downloadsrc)
 	if [ ! -d $BASEDIR/cache ]; then
 		mkdir $BASEDIR/cache