nano: Update to 4.9.2

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

diff --git a/make.sh b/make.sh
index ce582273607b3ecef8b09e1da92aad9b0265922f..78c4edc9097edd9a1e067114392bad7ddc37a676 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
-CORE="142"                                                     # Core Level (Filename)
+CORE="145"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"                       # Git Branch
 GIT_TAG="$(git tag | tail -1)"                                 # Git Tag
 GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"                        # Last commit
 
-TOOLCHAINVER=20200108
+TOOLCHAINVER=20200324
 
 ###############################################################################
 #
@@ -285,6 +285,7 @@ stdumount() {
        umount $BASEDIR/build/usr/src/log               2>/dev/null;
        umount $BASEDIR/build/usr/src/src               2>/dev/null;
        umount $BASEDIR/build/usr/src           2>/dev/null;
+       umount $BASEDIR/build/tmp               2>/dev/null;
 }
 
 now() {
@@ -476,6 +477,9 @@ prepareenv() {
        if [ "${ENABLE_RAMDISK}" = "on" ]; then
                mkdir -p $BASEDIR/build/usr/src
                mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
+
+               mkdir -p ${BASEDIR}/build/tmp
+               mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 ${BASEDIR}/build/tmp
        fi
 
        mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
@@ -501,6 +505,7 @@ prepareenv() {
 
        # Run LFS static binary creation scripts one by one
        export CCACHE_DIR=$BASEDIR/ccache
+       export CCACHE_TEMPDIR="/tmp"
        export CCACHE_COMPRESS=1
        export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${BUILD_ARCH}"
 
@@ -515,7 +520,7 @@ prepareenv() {
                        system_release="${system_release} - ${GIT_BRANCH}"
                        ;;
                *)
-                       system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
+                       system_release="${system_release} - core${CORE} Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}"
                        ;;
        esac
 
@@ -572,6 +577,7 @@ enterchroot() {
                BUILD_ARCH="${BUILD_ARCH}" \
                BUILD_PLATFORM="${BUILD_PLATFORM}" \
                CCACHE_DIR=/usr/src/ccache \
+               CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \
                CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
                CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                GOCACHE="/usr/src/ccache/go" \
@@ -655,6 +661,7 @@ lfsmake1() {
        cd $BASEDIR/lfs && env -i \
                PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/bin:$PATH" \
                CCACHE_DIR="${CCACHE_DIR}" \
+               CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \
                CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
                CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
                CFLAGS="${CFLAGS}" \
@@ -1077,6 +1084,7 @@ buildbase() {
        lfsmake2 autoconf
        lfsmake2 automake
        lfsmake2 berkeley
+       lfsmake2 berkeley-compat
        lfsmake2 coreutils
        lfsmake2 iana-etc
        lfsmake2 m4
@@ -1099,6 +1107,7 @@ buildbase() {
        lfsmake2 flex
        lfsmake2 gawk
        lfsmake2 gettext
+       lfsmake2 go
        lfsmake2 grep
        lfsmake2 groff
        lfsmake2 gperf
@@ -1111,7 +1120,6 @@ buildbase() {
        lfsmake2 pkg-config
        lfsmake2 make
        lfsmake2 man
-       lfsmake2 kmod
        lfsmake2 net-tools
        lfsmake2 patch
        lfsmake2 psmisc
@@ -1121,7 +1129,6 @@ buildbase() {
        lfsmake2 tar
        lfsmake2 texinfo
        lfsmake2 util-linux
-       lfsmake2 udev
        lfsmake2 vim
 }
 
@@ -1133,6 +1140,8 @@ buildipfire() {
   lfsmake2 backup
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+  lfsmake2 kmod
+  lfsmake2 udev
   lfsmake2 popt
   lfsmake2 libedit
   lfsmake2 libusb
@@ -1246,6 +1255,8 @@ buildipfire() {
   lfsmake2 libnl-3
   lfsmake2 libidn
   lfsmake2 nasm
+  lfsmake2 libarchive
+  lfsmake2 cmake
   lfsmake2 libjpeg
   lfsmake2 libjpeg-compat
   lfsmake2 libexif
@@ -1274,8 +1285,6 @@ buildipfire() {
   lfsmake2 bootstrap
   lfsmake2 arping
   lfsmake2 beep
-  lfsmake2 libarchive
-  lfsmake2 cmake
   lfsmake2 libssh
   lfsmake2 cdrkit
   lfsmake2 dosfstools
@@ -1399,6 +1408,7 @@ buildipfire() {
   lfsmake2 cifs-utils
   lfsmake2 krb5
   lfsmake2 samba
+  lfsmake2 netatalk
   lfsmake2 sudo
   lfsmake2 mc
   lfsmake2 wget
@@ -1408,7 +1418,6 @@ buildipfire() {
   lfsmake2 chkconfig
   lfsmake2 postfix
   lfsmake2 fetchmail
-  lfsmake2 cyrus-imapd
   lfsmake2 clamav
   lfsmake2 perl-NetAddr-IP
   lfsmake2 spamassassin
@@ -1499,7 +1508,6 @@ buildipfire() {
   lfsmake2 syslinux
   lfsmake2 tftpd
   lfsmake2 cpufrequtils
-  lfsmake2 bluetooth
   lfsmake2 gutenprint
   lfsmake2 apcupsd
   lfsmake2 iperf
@@ -1516,6 +1524,7 @@ buildipfire() {
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
   lfsmake2 openvmtools
+  lfsmake2 libmicrohttpd
   lfsmake2 motion
   lfsmake2 joe
   lfsmake2 monit