X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=30b42bbdbc7bca27e5894707dfb44f1d0e6604c7;hp=7eaa08490a1a3a7a37ebec93e7d104e46c131a85;hb=4e54a8e2d6d4286f85a38a492d34452092404b24;hpb=8634797e8a1ccc3b293adcec090c57832c4e9363 diff --git a/make.sh b/make.sh index 7eaa08490a..30b42bbdbc 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,10 @@ 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="132" # Core Level (Filename) -PAKFIRE_CORE="131" # Core Level (PAKFIRE) +CORE="133" # Core Level (Filename) +PAKFIRE_CORE="132" # 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 @@ -37,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=20181030 +TOOLCHAINVER=20190427 ############################################################################### # @@ -519,6 +520,9 @@ prepareenv() { SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" ;; esac + + # Setup ccache cache size + enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}" >/dev/null } enterchroot() { @@ -899,6 +903,7 @@ update_contributors() { } # Default settings +CCACHE_CACHE_SIZE="8G" ENABLE_RAMDISK="auto" # Load configuration file @@ -1013,6 +1018,7 @@ buildtoolchain() { lfsmake1 make lfsmake1 patch lfsmake1 perl + lfsmake1 python3 lfsmake1 sed lfsmake1 tar lfsmake1 texinfo @@ -1335,8 +1341,12 @@ buildipfire() { lfsmake2 setserial lfsmake2 setup lfsmake2 libdnet + lfsmake2 jansson lfsmake2 yaml lfsmake2 libhtp + lfsmake2 colm + lfsmake2 ragel + lfsmake2 hyperscan lfsmake2 suricata lfsmake2 oinkmaster lfsmake2 ids-ruleset-sources @@ -1496,7 +1506,6 @@ buildipfire() { lfsmake2 watchdog lfsmake2 libpri lfsmake2 libsrtp - lfsmake2 jansson lfsmake2 asterisk lfsmake2 usb_modeswitch lfsmake2 usb_modeswitch_data @@ -1613,6 +1622,7 @@ buildipfire() { lfsmake2 zabbix_agentd lfsmake2 flashrom lfsmake2 firmware-update + lfsmake2 tshark } buildinstaller() {