core140: ship glibc built with new gcc

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

diff --git a/make.sh b/make.sh
index 2377c40ce1a2d345ccfee5b3e4801df4a1a838c7..0d32f812bac5ed11f38cd70ef233f1deab675cb7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,9 +25,9 @@
 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.23"                                                 # Version number
-CORE="138"                                                     # Core Level (Filename)
-PAKFIRE_CORE="138"                                             # Core Level (PAKFIRE)
+VERSION="2.25"                                                 # Version number
+CORE="140"                                                     # Core Level (Filename)
+PAKFIRE_CORE="140"                                             # 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
@@ -38,7 +38,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=20190814
+TOOLCHAINVER=20200108
 
 ###############################################################################
 #
@@ -174,6 +174,7 @@ configure_build() {
                        CROSSTARGET="${build_arch}-cross-linux-gnueabi"
                        BUILD_PLATFORM="arm"
                        CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer"
+                       RUSTFLAGS="-Ccodegen-units=1"
                        ;;
 
                *)
@@ -462,7 +463,7 @@ prepareenv() {
        # Setup environment
        set +h
        LC_ALL=POSIX
-       export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM
+       export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS
        unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
        # Make some extra directories
@@ -547,6 +548,7 @@ enterchroot() {
                CONFIG_ROOT="${CONFIG_ROOT}" \
                CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
                CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
+               RUSTFLAGS="${RUSTFLAGS}" \
                BUILDTARGET="${BUILDTARGET}" \
                CROSSTARGET="${CROSSTARGET}" \
                BUILD_ARCH="${BUILD_ARCH}" \
@@ -554,6 +556,7 @@ enterchroot() {
                CCACHE_DIR=/usr/src/ccache \
                CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
                CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
+               GOCACHE="/usr/src/ccache/go" \
                KVER="${KVER}" \
                XZ_OPT="${XZ_OPT}" \
                DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \
@@ -1331,6 +1334,7 @@ buildipfire() {
   lfsmake2 python-ipaddress
   lfsmake2 glib
   lfsmake2 GeoIP
+  lfsmake2 geoip-database
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1631,6 +1635,8 @@ buildipfire() {
   lfsmake2 tshark
   lfsmake2 geoip-generator
   lfsmake2 speedtest-cli
+  lfsmake2 rfkill
+  lfsmake2 amazon-ssm-agent
 }
 
 buildinstaller() {