core145: add hyperscan

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

diff --git a/make.sh b/make.sh
index 984fc95b2317677a4f2f093e322dee26938d375f..f507c5584c424289dbbf4a213a554d7ceb8a6246 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}"
 
@@ -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}" \
@@ -1099,6 +1106,7 @@ buildbase() {
        lfsmake2 flex
        lfsmake2 gawk
        lfsmake2 gettext
+       lfsmake2 go
        lfsmake2 grep
        lfsmake2 groff
        lfsmake2 gperf
@@ -1246,6 +1254,8 @@ buildipfire() {
   lfsmake2 libnl-3
   lfsmake2 libidn
   lfsmake2 nasm
+  lfsmake2 libarchive
+  lfsmake2 cmake
   lfsmake2 libjpeg
   lfsmake2 libjpeg-compat
   lfsmake2 libexif
@@ -1274,8 +1284,6 @@ buildipfire() {
   lfsmake2 bootstrap
   lfsmake2 arping
   lfsmake2 beep
-  lfsmake2 libarchive
-  lfsmake2 cmake
   lfsmake2 libssh
   lfsmake2 cdrkit
   lfsmake2 dosfstools
@@ -1498,7 +1506,6 @@ buildipfire() {
   lfsmake2 syslinux
   lfsmake2 tftpd
   lfsmake2 cpufrequtils
-  lfsmake2 bluetooth
   lfsmake2 gutenprint
   lfsmake2 apcupsd
   lfsmake2 iperf
@@ -1515,6 +1522,7 @@ buildipfire() {
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
   lfsmake2 openvmtools
+  lfsmake2 libmicrohttpd
   lfsmake2 motion
   lfsmake2 joe
   lfsmake2 monit