X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=8e365b7e33d78507e38023cd5d8238bb4699f1eb;hp=cfb06fcd0e44ec5703f40d4910c2acf71bd58ef3;hb=4ab80c5daff0f433ca71529b0b60b691cfbc0e70;hpb=1ac0d5c598f6a7a2151b4cafed0120b8d8f1a2d6

diff --git a/make.sh b/make.sh
index cfb06fcd0e..8e365b7e33 100755
--- a/make.sh
+++ b/make.sh
@@ -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=""
@@ -1137,17 +1159,6 @@ buildipfire() {
 #		lfsmake2 backports			KCFG="-multi"
 #		lfsmake2 e1000e			KCFG="-multi"
 #		lfsmake2 igb				KCFG="-multi"
-#		lfsmake2 ixgbe			KCFG="-multi"
-		lfsmake2 xtables-addons		KCFG="-multi"
-		lfsmake2 linux-initrd			KCFG="-multi"
-		;;
-
-	aarch64)
-		# arm multi platform (RPi3, OrangePi PC2 ...) kernel build
-		lfsmake2 linux			KCFG="-multi"
-#		lfsmake2 backports			KCFG="-multi"
-#		lfsmake2 e1000e			KCFG="-multi"
-#		lfsmake2 igb				KCFG="-multi"
 #		lfsmake2 ixgbe			KCFG="-multi"
 		lfsmake2 xtables-addons		KCFG="-multi"
 		lfsmake2 linux-initrd			KCFG="-multi"
@@ -1318,6 +1329,7 @@ buildipfire() {
   lfsmake2 dbus
   lfsmake2 intltool
   lfsmake2 libdaemon
+  lfsmake2 avahi
   lfsmake2 cups
   lfsmake2 lcms2
   lfsmake2 ghostscript
@@ -1477,6 +1489,8 @@ buildipfire() {
   lfsmake2 python-progressbar
   lfsmake2 python-xattr
   lfsmake2 ddns
+  lfsmake2 python3-botocore
+  lfsmake2 aws-cli
   lfsmake2 transmission
   lfsmake2 dpfhack
   lfsmake2 lcd4linux
@@ -1875,8 +1889,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