python3-botocore: Required by aws-cli

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 1050eb03b5c6139b8f34889b837f774077eae213..8e365b7e33d78507e38023cd5d8238bb4699f1eb 100755 (executable)
--- 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=""
@@ -1142,6 +1164,7 @@ buildipfire() {
                lfsmake2 linux-initrd                   KCFG="-multi"
                ;;
   esac
+  lfsmake2 intel-microcode
   lfsmake2 xtables-addons                      USPACE="1"
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
@@ -1306,6 +1329,7 @@ buildipfire() {
   lfsmake2 dbus
   lfsmake2 intltool
   lfsmake2 libdaemon
+  lfsmake2 avahi
   lfsmake2 cups
   lfsmake2 lcms2
   lfsmake2 ghostscript
@@ -1322,7 +1346,6 @@ buildipfire() {
   lfsmake2 mc
   lfsmake2 wget
   lfsmake2 bridge-utils
-#  lfsmake2 screen
   lfsmake2 smartmontools
   lfsmake2 htop
   lfsmake2 chkconfig
@@ -1466,6 +1489,8 @@ buildipfire() {
   lfsmake2 python-progressbar
   lfsmake2 python-xattr
   lfsmake2 ddns
+  lfsmake2 python3-botocore
+  lfsmake2 aws-cli
   lfsmake2 transmission
   lfsmake2 dpfhack
   lfsmake2 lcd4linux
@@ -1534,6 +1559,7 @@ buildipfire() {
   lfsmake2 iftop
   lfsmake2 mdns-repeater
   lfsmake2 i2c-tools
+  lfsmake2 nss-myhostname
 }
 
 buildinstaller() {
@@ -1785,8 +1811,8 @@ toolchain)
        buildtoolchain
        echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE
        test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
-       cd $BASEDIR && XZ_OPT="$(XZ_OPT)" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz --xz \
-               build/${TOOLS_DIR} build/bin/sh log >> $LOGFILE
+       cd $BASEDIR && tar -cf- --exclude='log/_build.*.log' build/${TOOLS_DIR} build/bin/sh log | xz ${XZ_OPT} \
+               > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz
        md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \
                > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5
        stdumount
@@ -1863,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