Start Core Update 95

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

diff --git a/make.sh b/make.sh
index 36879760ff44ef78968f8132cf765f64a6554008..95877a4d7f6e5d45f01748fe69481faf05d06d67 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.17"                                                 # Version number
-CORE="94"                                                      # Core Level (Filename)
-PAKFIRE_CORE="93"                                              # Core Level (PAKFIRE)
+CORE="95"                                                      # Core Level (Filename)
+PAKFIRE_CORE="94"                                              # 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
@@ -36,7 +36,7 @@ BUILD_IMAGES=1                                                        # Flash and Xen Downloader
 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=9
+TOOLCHAINVER=10
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"
@@ -86,21 +86,6 @@ if [ -z $EDITOR ]; then
        [ -z $EDITOR ] && exiterror "You should have installed an editor."
 fi
 
-# Prepare string for /etc/system-release.
-SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
-if [ "$(git status -s | wc -l)" == "0" ]; then
-       GIT_STATUS=""
-else
-       GIT_STATUS="-dirty"
-fi
-case "$GIT_BRANCH" in
-       core*|beta?|rc?)
-               SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
-               ;;
-       *)
-               SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
-               ;;
-esac
 
 prepareenv() {
     ############################################################################
@@ -236,15 +221,36 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_COMPILERCHECK="none"
+    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}"
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
     rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
+
+    # Prepare string for /etc/system-release.
+    SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
+    if [ "$(git status -s | wc -l)" == "0" ]; then
+       GIT_STATUS=""
+    else
+       GIT_STATUS="-dirty"
+    fi
+    case "$GIT_BRANCH" in
+       core*|beta?|rc?)
+               SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
+               ;;
+       *)
+               SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
+               ;;
+    esac
 }
 
 buildtoolchain() {
     local error=false
     case "${TARGET_ARCH}:${BUILD_ARCH}" in
+        # x86_64
+        x86_64:x86_64)
+             # This is working.
+             ;;
+
         # x86
         i586:i586|i586:i686|i586:x86_64)
             # These are working.
@@ -413,6 +419,16 @@ buildipfire() {
   ipfiremake iptables
 
   case "${TARGET_ARCH}" in
+       x86_64)
+               ipfiremake linux                        KCFG=""
+               ipfiremake backports                    KCFG=""
+               ipfiremake cryptodev                    KCFG=""
+               ipfiremake e1000e                       KCFG=""
+#              ipfiremake igb                          KCFG=""
+               ipfiremake ixgbe                        KCFG=""
+               ipfiremake xtables-addons               KCFG=""
+               ipfiremake linux-initrd                 KCFG=""
+               ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
@@ -641,6 +657,7 @@ buildipfire() {
   ipfiremake clamav
   ipfiremake spamassassin
   ipfiremake amavisd
+  ipfiremake dma
   ipfiremake alsa
   ipfiremake mpfire
   ipfiremake guardian
@@ -713,6 +730,8 @@ buildipfire() {
   ipfiremake perl-Net-SMTP-SSL
   ipfiremake perl-MIME-Base64
   ipfiremake perl-Authen-SASL
+  ipfiremake perl-MIME-Lite
+  ipfiremake perl-Email-Date-Format
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake vnstat
@@ -887,6 +906,10 @@ buildpackages() {
   mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 
   cd $BASEDIR
+
+  # remove not useable iso on armv5tel (needed to build flash images)
+  [ "${TARGET_ARCH}" = "armv5tel" ] && rm -rf *.iso
+
   for i in `ls *.bz2 *.img.gz *.iso`; do
        md5sum $i > $i.md5
   done