python3-yaml: New paclage as required by aws-cli
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index f9f4570..e254787 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="119"                                                     # Core Level (Filename)
-PAKFIRE_CORE="119"                                             # 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
 
 ###############################################################################
 #
@@ -225,6 +225,30 @@ configure_build() {
 
                MAKETUNING="-j${parallelism}"
        fi
+
+       # Compression parameters
+       # We use mode 8 for reasonable memory usage when decompressing
+       # but with overall good compression
+       XZ_OPT="-8"
+
+       # We try to use as many cores as possible
+       XZ_OPT="${XZ_OPT} -T0"
+
+       # We need to limit memory because XZ uses too much when running
+       # in parallel and it isn't very smart in limiting itself.
+       # We allow XZ to use up to 70% of all system memory.
+       local xz_memory=$(( HOST_MEM * 7 / 10 ))
+
+       # XZ memory cannot be larger than 2GB on 32 bit systems
+       case "${build_arch}" in
+               i*86|armv*)
+                       if [ ${xz_memory} -gt 2048 ]; then
+                               xz_memory=2048
+                       fi
+                       ;;
+       esac
+
+       XZ_OPT="${XZ_OPT} --memory=${xz_memory}MiB"
 }
 
 configure_build_guess() {
@@ -416,7 +440,7 @@ prepareenv() {
 
        # Checking if running as root user
        if [ $(id -u) -ne 0 ]; then
-                       exiterror "Not building as root"
+                       exiterror "root privileges required for building"
        fi
 
        # Checking for necessary temporary space
@@ -526,6 +550,7 @@ enterchroot() {
                CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
                CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                KVER="${KVER}" \
+               XZ_OPT="${XZ_OPT}" \
                $(fake_environ) \
                $(qemu_environ) \
                "$@"
@@ -846,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
@@ -1045,6 +1092,7 @@ buildipfire() {
   lfsmake2 which
   lfsmake2 linux-firmware
   lfsmake2 dvb-firmwares
+  lfsmake2 xr819-firmware
   lfsmake2 zd1211-firmware
   lfsmake2 rpi-firmware
   lfsmake2 bc
@@ -1063,10 +1111,11 @@ buildipfire() {
   lfsmake2 libnetfilter_cthelper
   lfsmake2 libnetfilter_cttimeout
   lfsmake2 iptables
+  lfsmake2 screen
   lfsmake2 elfutils
 
   case "${BUILD_ARCH}" in
-       x86_64)
+       x86_64|aarch64)
                lfsmake2 linux                  KCFG=""
 #              lfsmake2 backports                      KCFG=""
 #              lfsmake2 e1000e                 KCFG=""
@@ -1096,28 +1145,30 @@ buildipfire() {
                ;;
 
        armv5tel)
-               # arm multi platform (Panda, Wandboard ...) 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"
-
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                lfsmake2 linux                  KCFG="-kirkwood"
-               lfsmake2 backports                      KCFG="-kirkwood"
-               lfsmake2 e1000e                 KCFG="-kirkwood"
-               lfsmake2 igb                            KCFG="-kirkwood"
-               lfsmake2 ixgbe                  KCFG="-kirkwood"
+#              lfsmake2 backports                      KCFG="-kirkwood"
+#              lfsmake2 e1000e                 KCFG="-kirkwood"
+#              lfsmake2 igb                            KCFG="-kirkwood"
+#              lfsmake2 ixgbe                  KCFG="-kirkwood"
                lfsmake2 xtables-addons         KCFG="-kirkwood"
                lfsmake2 linux-initrd                   KCFG="-kirkwood"
+
+               # arm multi platform (Panda, Wandboard ...) 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"
                ;;
   esac
+  lfsmake2 intel-microcode
   lfsmake2 xtables-addons                      USPACE="1"
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+  lfsmake2 openssl-compat
   lfsmake2 libgpg-error
   lfsmake2 libgcrypt
   lfsmake2 libassuan
@@ -1246,7 +1297,6 @@ buildipfire() {
   lfsmake2 python-ipaddress
   lfsmake2 glib
   lfsmake2 GeoIP
-  lfsmake2 noip_updater
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1279,6 +1329,7 @@ buildipfire() {
   lfsmake2 dbus
   lfsmake2 intltool
   lfsmake2 libdaemon
+  lfsmake2 avahi
   lfsmake2 cups
   lfsmake2 lcms2
   lfsmake2 ghostscript
@@ -1295,7 +1346,6 @@ buildipfire() {
   lfsmake2 mc
   lfsmake2 wget
   lfsmake2 bridge-utils
-  lfsmake2 screen
   lfsmake2 smartmontools
   lfsmake2 htop
   lfsmake2 chkconfig
@@ -1428,6 +1478,8 @@ buildipfire() {
   lfsmake2 parted
   lfsmake2 swig
   lfsmake2 u-boot
+  lfsmake2 u-boot-kirkwood
+  lfsmake2 python-typing
   lfsmake2 python-m2crypto
   lfsmake2 wireless-regdb
   lfsmake2 crda
@@ -1437,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
@@ -1485,7 +1545,6 @@ buildipfire() {
   lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
-  lfsmake2 swconfig
   lfsmake2 haproxy
   lfsmake2 ipset
   lfsmake2 lua
@@ -1506,6 +1565,7 @@ buildipfire() {
   lfsmake2 iftop
   lfsmake2 mdns-repeater
   lfsmake2 i2c-tools
+  lfsmake2 nss-myhostname
 }
 
 buildinstaller() {
@@ -1552,10 +1612,9 @@ buildpackages() {
   modprobe loop 2>/dev/null
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        lfsmake2 flash-images
-       lfsmake2 flash-images SCON=1
   fi
 
-  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
+  mv $LFS/install/images/{*.iso,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
 
@@ -1567,7 +1626,7 @@ buildpackages() {
   # remove not useable iso on armv5tel (needed to build flash images)
   [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso
 
-  for i in `ls *.bz2 *.img.gz *.iso`; do
+  for i in `ls *.bz2 *.img.xz *.iso`; do
        md5sum $i > $i.md5
   done
   cd $PWD
@@ -1758,8 +1817,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="-T0 -8" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.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
@@ -1836,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