]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
core135: Ship updated sysctl.conf
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index e9630d335f640e805bfc499df9347b6121264d54..d6f6f71470e057c4fc057190ad6d41d1fbf957ac 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,8 +26,8 @@ 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="133"                                                     # Core Level (Filename)
-PAKFIRE_CORE="132"                                             # Core Level (PAKFIRE)
+CORE="135"                                                     # Core Level (Filename)
+PAKFIRE_CORE="134"                                             # 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
@@ -469,7 +469,7 @@ prepareenv() {
        mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null
        mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null
        mkdir -p $BASEDIR/build/{dev/{shm,pts},proc,sys}
-       mkdir -p $BASEDIR/{cache,ccache} 2>/dev/null
+       mkdir -p $BASEDIR/{cache,ccache/${BUILD_ARCH}} 2>/dev/null
 
        if [ "${ENABLE_RAMDISK}" = "on" ]; then
                mkdir -p $BASEDIR/build/usr/src
@@ -488,7 +488,7 @@ prepareenv() {
        mount --bind /proc           $BASEDIR/build/proc
        mount --bind /sys            $BASEDIR/build/sys
        mount --bind $BASEDIR/cache  $BASEDIR/build/usr/src/cache
-       mount --bind $BASEDIR/ccache $BASEDIR/build/usr/src/ccache
+       mount --bind $BASEDIR/ccache/${BUILD_ARCH} $BASEDIR/build/usr/src/ccache
        mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config
        mount --bind $BASEDIR/doc    $BASEDIR/build/usr/src/doc
        mount --bind $BASEDIR/html   $BASEDIR/build/usr/src/html
@@ -903,7 +903,7 @@ update_contributors() {
 }
 
 # Default settings
-CCACHE_CACHE_SIZE="8G"
+CCACHE_CACHE_SIZE="4G"
 ENABLE_RAMDISK="auto"
 
 # Load configuration file