X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=e25478774a5b3ca0fdde174931417d0306399444;hp=aaaeb751e20d1e699d53154e046e82757bfe5e44;hb=d2da17a182196d3cb2dad4b887d35fc67f679cb9;hpb=2027c75ff34b504aaf220a21f92153261fcfc182;ds=sidebyside

diff --git a/make.sh b/make.sh
index aaaeb751e2..e25478774a 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.19"							# Version number
-CORE="121"							# Core Level (Filename)
-PAKFIRE_CORE="120"						# Core Level (PAKFIRE)
+VERSION="2.21"							# Version number
+CORE="123"							# Core Level (Filename)
+PAKFIRE_CORE="122"						# 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=20180213
+TOOLCHAINVER=20180606
 
 ###############################################################################
 #
@@ -871,6 +871,28 @@ update_language_list() {
 	done | sort -u > "${path}/LINGUAS"
 }
 
+contributors() {
+	local commits name
+
+	git shortlog --summary --numbered | while read -r commits name; do
+		echo "${name}"
+	done | grep -vE -e "^(alpha197|morlix|root|ummeegge)$" -e "via Development$" -e "@" -e "#$"
+}
+
+update_contributors() {
+	echo -n "Updating list of contributors"
+
+	local contributors="$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g")"
+
+	# Edit contributors into credits.cgi
+	awk -i inplace \
+		"/<!-- CONTRIBUTORS -->/{ p=1; print; printf \"${contributors}\n\"}/<!-- END -->/{ p=0 } !p" \
+		"${BASEDIR}/html/cgi-bin/credits.cgi"
+
+	print_status DONE
+	return 0
+}
+
 # Load configuration file
 if [ -f .config ]; then
 	. .config
@@ -1093,7 +1115,7 @@ buildipfire() {
   lfsmake2 elfutils
 
   case "${BUILD_ARCH}" in
-	x86_64)
+	x86_64|aarch64)
 		lfsmake2 linux			KCFG=""
 #		lfsmake2 backports			KCFG=""
 #		lfsmake2 e1000e			KCFG=""
@@ -1307,6 +1329,7 @@ buildipfire() {
   lfsmake2 dbus
   lfsmake2 intltool
   lfsmake2 libdaemon
+  lfsmake2 avahi
   lfsmake2 cups
   lfsmake2 lcms2
   lfsmake2 ghostscript
@@ -1323,7 +1346,6 @@ buildipfire() {
   lfsmake2 mc
   lfsmake2 wget
   lfsmake2 bridge-utils
-#  lfsmake2 screen
   lfsmake2 smartmontools
   lfsmake2 htop
   lfsmake2 chkconfig
@@ -1467,6 +1489,14 @@ buildipfire() {
   lfsmake2 python-progressbar
   lfsmake2 python-xattr
   lfsmake2 ddns
+  lfsmake2 python3-six
+  lfsmake2 python3-dateutil
+  lfsmake2 python3-jmespath
+  lfsmake2 python3-colorama
+  lfsmake2 python3-docutils
+  lfsmake2 python3-yaml
+  lfsmake2 python3-botocore
+  lfsmake2 aws-cli
   lfsmake2 transmission
   lfsmake2 dpfhack
   lfsmake2 lcd4linux
@@ -1535,6 +1565,7 @@ buildipfire() {
   lfsmake2 iftop
   lfsmake2 mdns-repeater
   lfsmake2 i2c-tools
+  lfsmake2 nss-myhostname
 }
 
 buildinstaller() {
@@ -1864,8 +1895,11 @@ lang)
 	update_language_list ${BASEDIR}/src/setup/po
 	print_status DONE
 	;;
+update-contributors)
+	update_contributors
+	;;
 *)
-	echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}"
+	echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors}"
 	cat doc/make.sh-usage
 	;;
 esac