make.sh: Make BUILDTARGET consistent for all architectures

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

diff --git a/make.sh b/make.sh
index 19ac87daf83837573c8d56fd73a9ab91d16b8e42..be915550496817349beaea5acd5cce05e962eb14 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -26,7 +26,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="164"                                                     # Core Level (Filename)
+CORE="165"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop
@@ -145,36 +145,35 @@ configure_build() {
 
        case "${build_arch}" in
                x86_64)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnu"
+                       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"
                        ;;
 
                aarch64)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnu"
+                       BUILDTARGET="${build_arch}-pc-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="arm"
                        CFLAGS_ARCH="-fstack-clash-protection"
                        ;;
 
                armv7hl)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnueabi"
+                       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}-unknown-linux-gnueabi"
+                       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"
-                       #RUSTFLAGS="-Ccodegen-units=1"
                        ;;
 
                riscv64)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnu"
+                       BUILDTARGET="${build_arch}-pc-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="riscv"
                        CFLAGS_ARCH="-fstack-clash-protection"
@@ -205,6 +204,8 @@ configure_build() {
        CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
        CXXFLAGS="${CFLAGS}"
 
+       RUSTFLAGS="-Copt-level=3 -Clink-arg=-Wl,-z,relro,-z,now -Ccodegen-units=1 --cap-lints=warn ${RUSTFLAGS_ARCH}"
+
        # Determine parallelism
        # We assume that each process consumes about
        # 128MB of memory. Therefore we find out how
@@ -1025,9 +1026,9 @@ buildtoolchain() {
        lfsmake1 libxcrypt
        lfsmake1 gcc                    PASS=L
        lfsmake1 zlib
-       lfsmake1 zstd
        lfsmake1 binutils                       PASS=2
        lfsmake1 gcc                    PASS=2
+       lfsmake1 zstd
        lfsmake1 ccache
        lfsmake1 tcl
        lfsmake1 expect
@@ -1128,6 +1129,7 @@ buildbase() {
        lfsmake2 util-linux
        lfsmake2 vim
        lfsmake2 e2fsprogs
+       lfsmake2 jq
 }
 
 buildipfire() {
@@ -1213,6 +1215,90 @@ buildipfire() {
   lfsmake2 sqlite
   lfsmake2 libffi
   lfsmake2 python3
+  lfsmake2 rust
+  lfsmake2 rust-dissimilar
+  lfsmake2 rust-cfg-if
+  lfsmake2 rust-libc
+  lfsmake2 rust-getrandom
+  lfsmake2 rust-typenum
+  lfsmake2 rust-version-check
+  lfsmake2 rust-generic-array
+  lfsmake2 rust-cipher
+  lfsmake2 rust-hex
+  lfsmake2 rust-unicode-xid
+  lfsmake2 rust-proc-macro2
+  lfsmake2 rust-quote
+  lfsmake2 rust-syn
+  lfsmake2 rust-home
+  lfsmake2 rust-lazy-static
+  lfsmake2 rust-memchr
+  lfsmake2 rust-aho-corasick
+  lfsmake2 rust-regex-syntax
+  lfsmake2 rust-regex
+  lfsmake2 rust-ucd-trie
+  lfsmake2 rust-pest
+  lfsmake2 rust-semver-parser
+  lfsmake2 rust-semver
+  lfsmake2 rust-same-file
+  lfsmake2 rust-walkdir
+  lfsmake2 rust-dirs
+  lfsmake2 rust-toolchain_find
+  lfsmake2 rust-serde
+  lfsmake2 rust-itoa
+  lfsmake2 rust-ryu
+  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
+  lfsmake2 rust-rand_core-0.4.2
+  lfsmake2 rust-rand_core-0.3.1
+  lfsmake2 rust-rand_chacha
+  lfsmake2 rust-rand_hc
+  lfsmake2 rust-rand
+  lfsmake2 rust-rdrand
+  lfsmake2 rust-rand-0.4
+  lfsmake2 rust-log
+  lfsmake2 rust-num_cpus
+  lfsmake2 rust-crossbeam-utils
+  lfsmake2 rust-autocfg
+  lfsmake2 rust-memoffset
+  lfsmake2 rust-scopeguard
+  lfsmake2 rust-crossbeam-epoch
+  lfsmake2 rust-crossbeam-deque
+  lfsmake2 rust-either
+  lfsmake2 rust-crossbeam-channel
+  lfsmake2 rust-rayon-core
+  lfsmake2 rust-rayon
+  lfsmake2 rust-remove_dir_all
+  lfsmake2 rust-tempdir
+  lfsmake2 rust-glob
+  lfsmake2 rust-once_cell
+  lfsmake2 rust-termcolor
+  lfsmake2 rust-toml
+  lfsmake2 rust-serde_derive
+  lfsmake2 rust-trybuild
+  lfsmake2 rust-unindent
+  lfsmake2 rust-proc-macro-hack
+  lfsmake2 rust-indoc-impl
+  lfsmake2 rust-indoc
+  lfsmake2 rust-instant
+  lfsmake2 rust-lock_api
+  lfsmake2 rust-smallvec
+  lfsmake2 rust-parking_lot_core
+  lfsmake2 rust-parking_lot
+  lfsmake2 rust-paste-impl
+  lfsmake2 rust-paste
+  lfsmake2 rust-ctor
+  lfsmake2 rust-ghost
+  lfsmake2 rust-inventory-impl
+  lfsmake2 rust-inventory
+  lfsmake2 rust-pyo3-build-config
+  lfsmake2 rust-pyo3-macros-backend
+  lfsmake2 rust-pyo3-macros
+  lfsmake2 rust-pyo3
   lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar
@@ -1301,7 +1387,7 @@ buildipfire() {
   lfsmake2 Digest
   lfsmake2 Digest-SHA1
   lfsmake2 Digest-HMAC
-  lfsmake2 perl-libwww
+  lfsmake2 libwww-perl
   lfsmake2 Net-DNS
   lfsmake2 Net-IPv4Addr
   lfsmake2 Net_SSLeay
@@ -1339,7 +1425,6 @@ buildipfire() {
   lfsmake2 rrdtool
   lfsmake2 setup
   lfsmake2 libdnet
-  lfsmake2 rust
   lfsmake2 jansson
   lfsmake2 yaml
   lfsmake2 libhtp
@@ -1411,7 +1496,6 @@ buildipfire() {
   lfsmake2 rsync
   lfsmake2 rpcbind
   lfsmake2 keyutils
-  lfsmake2 libnfsidmap
   lfsmake2 nfs
   lfsmake2 gnu-netcat
   lfsmake2 ncat
@@ -1599,6 +1683,7 @@ buildipfire() {
   lfsmake2 libcdada
   lfsmake2 pmacct
   lfsmake2 squid-asnbl
+  lfsmake2 qemu-ga
 }
 
 buildinstaller() {