X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=b0a4b89268939f8cf964848aee7ae84261e5eb17;hb=94aeac8a050d1df7f6a59ae7528cdc32c364ac84;hp=5ce67b64b4fb9ae5f7004eda75ca94c9ff7b895d;hpb=8318a967e2d1ff2882cd2c670dc0f5ead256e844;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/make.sh b/make.sh index 5ce67b64b4..b0a4b89268 100755 --- a/make.sh +++ b/make.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -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="173" # Core Level (Filename) +CORE="178" # 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=20220808 +TOOLCHAINVER=20230620 # use multicore and max compression ZSTD_OPT="-T0 --ultra -22" @@ -145,35 +145,21 @@ configure_build() { BUILDTARGET="${build_arch}-pc-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu" BUILD_PLATFORM="x86" - CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection -fcf-protection" + CFLAGS_ARCH="-m64 -mtune=generic -fcf-protection=full" ;; aarch64) BUILDTARGET="${build_arch}-pc-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu" BUILD_PLATFORM="arm" - CFLAGS_ARCH="-fstack-clash-protection" - ;; - - armv7hl) - BUILDTARGET="${build_arch}-pc-linux-gnueabi" - CROSSTARGET="${build_arch}-cross-linux-gnueabi" - BUILD_PLATFORM="arm" - CFLAGS_ARCH="-march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" - ;; - - armv6l) - BUILDTARGET="${build_arch}-pc-linux-gnueabi" - CROSSTARGET="${build_arch}-cross-linux-gnueabi" - BUILD_PLATFORM="arm" - CFLAGS_ARCH="-march=armv6zk+fp -mfpu=vfp -mfloat-abi=softfp -fomit-frame-pointer" + CFLAGS_ARCH="-mbranch-protection=standard" ;; riscv64) BUILDTARGET="${build_arch}-pc-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu" BUILD_PLATFORM="riscv" - CFLAGS_ARCH="-fstack-clash-protection" + CFLAGS_ARCH="" ;; *) @@ -196,7 +182,7 @@ configure_build() { TOOLS_DIR="/tools_${BUILD_ARCH}" # Enables hardening - HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong" + HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection" CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}" CXXFLAGS="${CFLAGS}" @@ -236,15 +222,6 @@ configure_build() { # We allow XZ to use up to 70% of all system memory. local xz_memory=$(( SYSTEM_MEMORY * 7 / 10 )) - # XZ memory cannot be larger than 2GB on 32 bit systems - case "${build_arch}" in - armv*) - if [ ${xz_memory} -gt 2048 ]; then - xz_memory=2048 - fi - ;; - esac - XZ_OPT="${XZ_OPT} --memory=${xz_memory}MiB" } @@ -258,10 +235,6 @@ configure_build_guess() { echo "aarch64" ;; - armv7*|armv6*) - echo "armv6l" - ;; - riscv64) echo "riscv64" ;; @@ -1058,9 +1031,11 @@ buildbase() { lfsmake2 tzdata lfsmake2 cleanup-toolchain lfsmake2 zlib + [ "${BUILD_ARCH}" = "riscv64" ] && lfsmake2 gcc PASS=A lfsmake2 zstd lfsmake2 autoconf lfsmake2 automake + lfsmake2 help2man lfsmake2 libtool lfsmake2 binutils lfsmake2 gmp @@ -1138,13 +1113,6 @@ buildipfire() { lfsmake2 pptp lfsmake2 unzip lfsmake2 which - lfsmake2 linux-firmware - lfsmake2 dvb-firmwares - lfsmake2 xr819-firmware - lfsmake2 zd1211-firmware - lfsmake2 rpi-firmware - lfsmake2 intel-microcode - lfsmake2 pcengines-apu-firmware lfsmake2 bc lfsmake2 u-boot MKIMAGE=1 lfsmake2 cpio @@ -1173,7 +1141,6 @@ buildipfire() { lfsmake2 rtl8812au KCFG="" lfsmake2 rtl8822bu KCFG="" lfsmake2 rtl8821cu KCFG="" - lfsmake2 xradio KCFG="" lfsmake2 linux-initrd KCFG="" lfsmake2 expat @@ -1211,7 +1178,6 @@ buildipfire() { lfsmake2 libqmi lfsmake2 pam lfsmake2 c-ares - lfsmake2 rust lfsmake2 rust-dissimilar lfsmake2 rust-cfg-if lfsmake2 rust-libc @@ -1219,6 +1185,7 @@ buildipfire() { lfsmake2 rust-typenum lfsmake2 rust-version-check lfsmake2 rust-generic-array + lfsmake2 rust-crypto-common lfsmake2 rust-cipher lfsmake2 rust-hex lfsmake2 rust-unicode-xid @@ -1245,7 +1212,6 @@ buildipfire() { lfsmake2 rust-serde_json lfsmake2 rust-synstructure lfsmake2 rust-block-buffer - lfsmake2 rust-crypto-common lfsmake2 rust-digest lfsmake2 rust-ppv-lite86 lfsmake2 rust-rand_core @@ -1499,7 +1465,6 @@ buildipfire() { lfsmake2 libvorbis lfsmake2 flac lfsmake2 lame - lfsmake2 sox lfsmake2 soxr lfsmake2 libshout lfsmake2 xvid @@ -1522,6 +1487,13 @@ buildipfire() { lfsmake2 libstatgrab lfsmake2 liboping lfsmake2 collectd + lfsmake2 git + lfsmake2 linux-firmware + lfsmake2 dvb-firmwares + lfsmake2 zd1211-firmware + lfsmake2 rpi-firmware + lfsmake2 intel-microcode + lfsmake2 pcengines-apu-firmware lfsmake2 elinks lfsmake2 igmpproxy lfsmake2 opus @@ -1559,8 +1531,6 @@ buildipfire() { lfsmake2 perl-Authen-SASL lfsmake2 perl-MIME-Lite lfsmake2 perl-Email-Date-Format - lfsmake2 git - lfsmake2 squidclamav lfsmake2 vnstat lfsmake2 iw lfsmake2 wpa_supplicant @@ -1594,12 +1564,10 @@ buildipfire() { lfsmake2 zerofree lfsmake2 minicom lfsmake2 ddrescue - lfsmake2 powertop lfsmake2 parted lfsmake2 swig lfsmake2 dtc lfsmake2 u-boot - lfsmake2 u-boot-friendlyarm lfsmake2 wireless-regdb lfsmake2 ddns lfsmake2 python3-pycparser @@ -1636,12 +1604,13 @@ buildipfire() { lfsmake2 python3-terminaltables lfsmake2 python3-pkgconfig lfsmake2 python3-msgpack - lfsmake2 python3-attr lfsmake2 python3-attrs lfsmake2 python3-sniffio lfsmake2 python3-sortedcontainers lfsmake2 python3-outcome lfsmake2 python3-async_generator + lfsmake2 python3-flit_scm + lfsmake2 python3-exceptiongroup lfsmake2 python3-trio lfsmake2 python3-pyfuse3 lfsmake2 aws-cli @@ -1738,6 +1707,7 @@ buildipfire() { lfsmake2 perl-Imager-QRCode lfsmake2 perl-MIME-Base32 lfsmake2 perl-URI-Encode + lfsmake2 rsnapshot } buildinstaller() { @@ -1792,9 +1762,6 @@ buildpackages() { cd $BASEDIR - # remove not useable iso on armv6l (needed to build flash images) - [ "${BUILD_ARCH}" = "armv6l" ] && rm -rf *.iso - for i in $(ls *.bz2 *.img.xz *.iso 2>/dev/null); do b2sum $i > $i.b2 done