mediatomb: Disable build because it FTBFS

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

diff --git a/make.sh b/make.sh
index 235964b4b90e4a482d9b0dea5666cb0123a27e26..46bb3ad8d2757b73f51e8bc2870a1dc820b4459b 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="97"                                                      # Core Level (Filename)
+PAKFIRE_CORE="96"                                              # 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,10 +221,26 @@ 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() {
@@ -329,6 +330,7 @@ buildbase() {
     lfsmake2 gmp
     lfsmake2 gmp-compat
     lfsmake2 mpfr
+    lfsmake2 libmpc
     lfsmake2 file
     lfsmake2 gcc
     lfsmake2 sed
@@ -421,9 +423,8 @@ buildipfire() {
        x86_64)
                ipfiremake linux                        KCFG=""
                ipfiremake backports                    KCFG=""
-               ipfiremake cryptodev                    KCFG=""
                ipfiremake e1000e                       KCFG=""
-#              ipfiremake igb                          KCFG=""
+               ipfiremake igb                          KCFG=""
                ipfiremake ixgbe                        KCFG=""
                ipfiremake xtables-addons               KCFG=""
                ipfiremake linux-initrd                 KCFG=""
@@ -432,9 +433,8 @@ buildipfire() {
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
                ipfiremake backports                    KCFG="-pae"
-               ipfiremake cryptodev                    KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
-#              ipfiremake igb                          KCFG="-pae"
+               ipfiremake igb                          KCFG="-pae"
                ipfiremake ixgbe                        KCFG="-pae"
                ipfiremake xtables-addons               KCFG="-pae"
                ipfiremake linux-initrd                 KCFG="-pae"
@@ -442,9 +442,8 @@ buildipfire() {
                # x86 kernel build
                ipfiremake linux                        KCFG=""
                ipfiremake backports                    KCFG=""
-               ipfiremake cryptodev                    KCFG=""
                ipfiremake e1000e                       KCFG=""
-#              ipfiremake igb                          KCFG=""
+               ipfiremake igb                          KCFG=""
                ipfiremake ixgbe                        KCFG=""
                ipfiremake xtables-addons               KCFG=""
                ipfiremake linux-initrd                 KCFG=""
@@ -454,16 +453,14 @@ buildipfire() {
                # arm-rpi (Raspberry Pi) kernel build
                ipfiremake linux                        KCFG="-rpi"
                ipfiremake backports                    KCFG="-rpi"
-               ipfiremake cryptodev                    KCFG="-rpi"
                ipfiremake xtables-addons               KCFG="-rpi"
                ipfiremake linux-initrd                 KCFG="-rpi"
 
                # arm multi platform (Panda, Wandboard ...) kernel build
                ipfiremake linux                        KCFG="-multi"
                ipfiremake backports                    KCFG="-multi"
-               ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
-#              ipfiremake igb                          KCFG="-multi"
+               ipfiremake igb                          KCFG="-multi"
                ipfiremake ixgbe                        KCFG="-multi"
                ipfiremake xtables-addons               KCFG="-multi"
                ipfiremake linux-initrd                 KCFG="-multi"
@@ -471,9 +468,8 @@ buildipfire() {
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
                ipfiremake backports                    KCFG="-kirkwood"
-               ipfiremake cryptodev                    KCFG="-kirkwood"
                ipfiremake e1000e                       KCFG="-kirkwood"
-#              ipfiremake igb                          KCFG="-kirkwood"
+               ipfiremake igb                          KCFG="-kirkwood"
                ipfiremake ixgbe                        KCFG="-kirkwood"
                ipfiremake xtables-addons               KCFG="-kirkwood"
                ipfiremake linux-initrd                 KCFG="-kirkwood"
@@ -684,7 +680,6 @@ buildipfire() {
   ipfiremake ncftp
   ipfiremake etherwake
   ipfiremake bwm-ng
-  ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake strongswan
@@ -752,7 +747,7 @@ buildipfire() {
   ipfiremake streamripper
   ipfiremake sshfs
   ipfiremake taglib
-  ipfiremake mediatomb
+  #ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake perl-Sort-Naturally
@@ -849,6 +844,7 @@ buildipfire() {
   ipfiremake perl-Text-CSV_XS
   ipfiremake swconfig
   ipfiremake haproxy
+  ipfiremake ipset
 }
 
 buildinstaller() {
@@ -905,6 +901,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