X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=1d9163dce492950f2e85984e12c03702eb77488a;hp=7e6975299926a64554c3caa81ef0f0ae8d7d792a;hb=a04ec923897debb91c72b4c6223586ca0f1c7486;hpb=a0f37487475e510f12b5ced95b897af05598c7c5

diff --git a/make.sh b/make.sh
index 7e69752999..1d9163dce4 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="125"						# Core Level (PAKFIRE)
+CORE="127"							# 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
@@ -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"
 			;;
 
@@ -1177,6 +1180,7 @@ buildipfire() {
   lfsmake2 libassuan
   lfsmake2 nettle
   lfsmake2 json-c
+  lfsmake2 libconfig
   lfsmake2 libevent
   lfsmake2 libevent2
   lfsmake2 expat
@@ -1301,7 +1305,6 @@ buildipfire() {
   lfsmake2 python-daemon
   lfsmake2 python-ipaddress
   lfsmake2 glib
-  lfsmake2 GeoIP
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1372,6 +1375,7 @@ buildipfire() {
   lfsmake2 flac
   lfsmake2 lame
   lfsmake2 sox
+  lfsmake2 soxr
   lfsmake2 libshout
   lfsmake2 xvid
   lfsmake2 libmpeg2
@@ -1416,6 +1420,7 @@ buildipfire() {
   lfsmake2 ebtables
   lfsmake2 directfb
   lfsmake2 faad2
+  lfsmake2 alac
   lfsmake2 ffmpeg
   lfsmake2 vdr
   lfsmake2 vdr_streamdev
@@ -1428,6 +1433,7 @@ buildipfire() {
   lfsmake2 mpd
   lfsmake2 libmpdclient
   lfsmake2 mpc
+  lfsmake2 perl-Net-CIDR-Lite
   lfsmake2 perl-Net-SMTP-SSL
   lfsmake2 perl-MIME-Base64
   lfsmake2 perl-Authen-SASL
@@ -1576,6 +1582,7 @@ buildipfire() {
   lfsmake2 i2c-tools
   lfsmake2 nss-myhostname
   lfsmake2 dehydrated
+  lfsmake2 shairport-sync
 }
 
 buildinstaller() {
@@ -1764,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