Drop support for armv6l (and armv7hl)

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

diff --git a/make.sh b/make.sh
index 2e49b167383d42c247f41b26d27c2b150d78457c..84177a9472c01d64d2563b27c8466bd76112183d 100755 (executable)
--- 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="172"                                                     # 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
@@ -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"
                        ;;
 
                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=""
                        ;;
 
                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"
                        ;;
@@ -910,7 +883,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() {
@@ -1061,6 +1034,7 @@ buildbase() {
        lfsmake2 zstd
        lfsmake2 autoconf
        lfsmake2 automake
+       lfsmake2 help2man
        lfsmake2 libtool
        lfsmake2 binutils
        lfsmake2 gmp
@@ -1176,15 +1150,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,15 +1182,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
   lfsmake2 rust-libc
@@ -1211,6 +1192,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
@@ -1237,7 +1219,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
@@ -1319,10 +1300,6 @@ buildipfire() {
   lfsmake2 libnl-3
   lfsmake2 libidn
   lfsmake2 nasm
-  lfsmake2 libarchive
-  lfsmake2 cmake
-  lfsmake2 ninja
-  lfsmake2 meson
   lfsmake2 libjpeg
   lfsmake2 openjpeg
   lfsmake2 libexif
@@ -1417,11 +1394,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
@@ -1452,7 +1427,6 @@ buildipfire() {
   lfsmake2 vlan
   lfsmake2 wireless
   lfsmake2 pakfire
-  lfsmake2 spandsp
   lfsmake2 lz4
   lfsmake2 lzo
   lfsmake2 openvpn
@@ -1593,11 +1567,11 @@ 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
@@ -1790,9 +1764,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