X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=6488a77387706f28ee535d8196ff28c3dfd97b23;hb=db4374176a4ed4b73e42fb34ff198dd743f2f8cf;hp=e5cb873b05842908f1898eb8173863475560074e;hpb=c4fc6eb017d77b52846c3f6e84fc0f321b3e25e2;p=people%2Fmfischer%2Fipfire-2.x.git diff --git a/make.sh b/make.sh index e5cb873b05..6488a77387 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,7 @@ 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.27" # Version number -CORE="170" # Core Level (Filename) +CORE="173" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir MAX_RETRIES=1 # prefetch/check loop @@ -35,7 +35,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch GIT_TAG="$(git tag | tail -1)" # Git Tag GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit -TOOLCHAINVER=20220508 +TOOLCHAINVER=20220808 # use multicore and max compression ZSTD_OPT="-T0 --ultra -22" @@ -910,7 +910,7 @@ qemu_find_build_helper_name() { file_is_static() { local file="${1}" - file -L "${file}" 2>/dev/null | grep -q "statically linked" + file -L "${file}" 2>/dev/null | grep -q -e "statically linked" -e "static-pie linked" } update_language_list() { @@ -1176,15 +1176,28 @@ buildipfire() { lfsmake2 xradio KCFG="" lfsmake2 linux-initrd KCFG="" + lfsmake2 expat + lfsmake2 libconfig + lfsmake2 curl + lfsmake2 libarchive + lfsmake2 cmake + lfsmake2 json-c + lfsmake2 tcl + lfsmake2 libffi + lfsmake2 gdbm + lfsmake2 sqlite + lfsmake2 python3 + lfsmake2 python3-setuptools + lfsmake2 ninja + lfsmake2 meson + lfsmake2 glib + lfsmake2 libgudev lfsmake2 libgpg-error lfsmake2 libgcrypt lfsmake2 libassuan lfsmake2 nettle lfsmake2 libsodium - lfsmake2 json-c - lfsmake2 libconfig lfsmake2 libevent2 - lfsmake2 expat lfsmake2 apr lfsmake2 aprutil lfsmake2 unbound @@ -1195,14 +1208,9 @@ buildipfire() { lfsmake2 dhcpcd lfsmake2 boost lfsmake2 linux-atm - lfsmake2 gdbm + lfsmake2 libqmi lfsmake2 pam lfsmake2 c-ares - lfsmake2 curl - lfsmake2 tcl - lfsmake2 sqlite - lfsmake2 libffi - lfsmake2 python3 lfsmake2 rust lfsmake2 rust-dissimilar lfsmake2 rust-cfg-if @@ -1293,6 +1301,7 @@ buildipfire() { lfsmake2 rust-num-integer lfsmake2 rust-num_threads lfsmake2 rust-time + lfsmake2 rust-iana-time-zone lfsmake2 rust-chrono lfsmake2 rust-asn1_derive lfsmake2 rust-asn1 @@ -1307,6 +1316,7 @@ buildipfire() { lfsmake2 rust-pem lfsmake2 gdb lfsmake2 grub + lfsmake2 mandoc lfsmake2 efivar lfsmake2 efibootmgr lfsmake2 libtasn1 @@ -1317,10 +1327,6 @@ buildipfire() { lfsmake2 libnl-3 lfsmake2 libidn lfsmake2 nasm - lfsmake2 libarchive - lfsmake2 cmake - lfsmake2 ninja - lfsmake2 meson lfsmake2 libjpeg lfsmake2 openjpeg lfsmake2 libexif @@ -1415,11 +1421,9 @@ buildipfire() { lfsmake2 perl-Crypt-PasswdMD5 lfsmake2 perl-Net-Telnet lfsmake2 perl-JSON - lfsmake2 python3-setuptools lfsmake2 python3-inotify lfsmake2 python3-docutils lfsmake2 python3-daemon - lfsmake2 glib lfsmake2 ntp lfsmake2 openssh lfsmake2 fontconfig @@ -1506,7 +1510,6 @@ buildipfire() { lfsmake2 rpcbind lfsmake2 keyutils lfsmake2 nfs - lfsmake2 gnu-netcat lfsmake2 ncat lfsmake2 nmap lfsmake2 etherwake @@ -1516,7 +1519,6 @@ buildipfire() { lfsmake2 rng-tools lfsmake2 lsof lfsmake2 br2684ctl - lfsmake2 pcmciautils lfsmake2 lm_sensors lfsmake2 libstatgrab lfsmake2 liboping @@ -1524,6 +1526,8 @@ buildipfire() { lfsmake2 elinks lfsmake2 igmpproxy lfsmake2 opus + lfsmake2 python3-toml + lfsmake2 python3-pyproject2setuppy lfsmake2 python3-pyparsing lfsmake2 spice-protocol lfsmake2 spice @@ -1604,8 +1608,6 @@ buildipfire() { lfsmake2 python3-certifi lfsmake2 python3-idna lfsmake2 python3-requests - lfsmake2 python3-toml - lfsmake2 python3-pyproject2setuppy lfsmake2 python3-tomli lfsmake2 python3-pep517 lfsmake2 python3-build @@ -1641,7 +1643,6 @@ buildipfire() { lfsmake2 python3-sortedcontainers lfsmake2 python3-outcome lfsmake2 python3-async_generator - lfsmake2 python3-Cython lfsmake2 python3-trio lfsmake2 python3-pyfuse3 lfsmake2 aws-cli