core144: start update

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

diff --git a/make.sh b/make.sh
index ca40625e0b73f075445e4467adaa8af4fb7331fb..03eba4ac8310c335c5e89c4432160e00b1c7f224 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2019 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2020 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -26,8 +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)
-PAKFIRE_CORE="141"                                             # Core Level (PAKFIRE)
+CORE="144"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 NICE=10                                                                # Nice level
@@ -40,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
 
 ###############################################################################
 #
@@ -286,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() {
@@ -477,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}
@@ -502,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}"
 
@@ -516,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
 
@@ -557,7 +561,6 @@ enterchroot() {
                PS1="${PS1}" \
                PATH="${PATH}" \
                SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
-               PAKFIRE_CORE="${PAKFIRE_CORE}" \
                PAKFIRE_TREE="${PAKFIRE_TREE}" \
                NAME="${NAME}" \
                SNAME="${SNAME}" \
@@ -574,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" \
@@ -657,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}" \
@@ -1113,7 +1118,6 @@ buildbase() {
        lfsmake2 pkg-config
        lfsmake2 make
        lfsmake2 man
-       lfsmake2 kmod
        lfsmake2 net-tools
        lfsmake2 patch
        lfsmake2 psmisc
@@ -1123,7 +1127,6 @@ buildbase() {
        lfsmake2 tar
        lfsmake2 texinfo
        lfsmake2 util-linux
-       lfsmake2 udev
        lfsmake2 vim
 }
 
@@ -1135,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
@@ -1410,7 +1415,6 @@ buildipfire() {
   lfsmake2 chkconfig
   lfsmake2 postfix
   lfsmake2 fetchmail
-  lfsmake2 cyrus-imapd
   lfsmake2 clamav
   lfsmake2 perl-NetAddr-IP
   lfsmake2 spamassassin
@@ -1501,14 +1505,12 @@ buildipfire() {
   lfsmake2 syslinux
   lfsmake2 tftpd
   lfsmake2 cpufrequtils
-  lfsmake2 bluetooth
   lfsmake2 gutenprint
   lfsmake2 apcupsd
   lfsmake2 iperf
   lfsmake2 iperf3
   lfsmake2 7zip
   lfsmake2 lynis
-  lfsmake2 streamripper
   lfsmake2 sshfs
   lfsmake2 taglib
   lfsmake2 sslh
@@ -1538,7 +1540,6 @@ buildipfire() {
   lfsmake2 parted
   lfsmake2 swig
   lfsmake2 u-boot
-  lfsmake2 u-boot-kirkwood
   lfsmake2 u-boot-friendlyarm
   lfsmake2 python-typing
   lfsmake2 python-m2crypto
@@ -1616,7 +1617,6 @@ buildipfire() {
   lfsmake2 frr
   lfsmake2 dmidecode
   lfsmake2 mcelog
-  lfsmake2 rtpproxy
   lfsmake2 util-macros
   lfsmake2 libpciaccess
   lfsmake2 libyajl