core143: update local openssh config

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

diff --git a/make.sh b/make.sh
index 07c0f52c20f8cb7c2723099168694b807cd3d579..c250d56fc281a323cf0813d883d9b7a8bd3690dd 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="143"                                                     # 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}"
 
@@ -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}" \
@@ -1111,7 +1118,6 @@ buildbase() {
        lfsmake2 pkg-config
        lfsmake2 make
        lfsmake2 man
-       lfsmake2 kmod
        lfsmake2 net-tools
        lfsmake2 patch
        lfsmake2 psmisc
@@ -1121,7 +1127,6 @@ buildbase() {
        lfsmake2 tar
        lfsmake2 texinfo
        lfsmake2 util-linux
-       lfsmake2 udev
        lfsmake2 vim
 }
 
@@ -1133,6 +1138,8 @@ buildipfire() {
   lfsmake2 backup
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+  lfsmake2 kmod
+  lfsmake2 udev
   lfsmake2 popt
   lfsmake2 libedit
   lfsmake2 libusb
@@ -1498,7 +1505,6 @@ buildipfire() {
   lfsmake2 syslinux
   lfsmake2 tftpd
   lfsmake2 cpufrequtils
-  lfsmake2 bluetooth
   lfsmake2 gutenprint
   lfsmake2 apcupsd
   lfsmake2 iperf