libseccomp: Bump package version

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

diff --git a/make.sh b/make.sh
index dec918dd687ad6ffbf0a5811437eb9f60b7b6801..fda7ca1c4b3c371cc6096db2e8e2b3a03d29becc 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -295,10 +295,6 @@ stdumount() {
        umount $BASEDIR/build/tmp               2>/dev/null;
 }
 
-now() {
-       date -u "+%s"
-}
-
 format_runtime() {
        local seconds=${1}
 
@@ -437,7 +433,7 @@ prepareenv() {
        fi
 
        # Trap on emergency exit
-       trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGKILL SIGSTOP SIGQUIT
+       trap "exiterror 'Build process interrupted'" SIGINT SIGTERM SIGQUIT
 
        # Checking if running as root user
        if [ $(id -u) -ne 0 ]; then
@@ -547,7 +543,7 @@ prepareenv() {
        esac
 
        # Setup ccache cache size
-       enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}" >/dev/null
+       enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}"
 }
 
 enterchroot() {
@@ -741,7 +737,7 @@ ipfiredist() {
 wait_until_finished() {
        local pid=${1}
 
-       local start_time=$(now)
+       local start_time="${SECONDS}"
 
        # Show progress
        if ${INTERACTIVE}; then
@@ -751,7 +747,7 @@ wait_until_finished() {
 
                local runtime
                while kill -0 ${pid} 2>/dev/null; do
-                       print_runtime $(( $(now) - ${start_time} ))
+                       print_runtime $(( SECONDS - start_time ))
 
                        # Wait a little
                        sleep 1
@@ -763,7 +759,7 @@ wait_until_finished() {
        local ret=$?
 
        if ! ${INTERACTIVE}; then
-               print_runtime $(( $(now) - ${start_time} ))
+               print_runtime $(( SECONDS - start_time ))
        fi
 
        return ${ret}
@@ -785,7 +781,7 @@ fake_environ() {
 }
 
 qemu_environ() {
-       local env
+       local env="QEMU_TARGET_HELPER=${QEMU_TARGET_HELPER}"
 
        # Don't add anything if qemu is not used.
        if ! qemu_is_required; then
@@ -797,6 +793,11 @@ qemu_environ() {
                arm*)
                        QEMU_CPU="${QEMU_CPU:-cortex-a9}"
 
+                       env="${env} QEMU_CPU=${QEMU_CPU}"
+                       ;;
+               riscv64)
+                       QEMU_CPU="${QEMU_CPU:-sifive-u54}"
+
                        env="${env} QEMU_CPU=${QEMU_CPU}"
                        ;;
        esac
@@ -912,7 +913,7 @@ qemu_find_build_helper_name() {
 file_is_static() {
        local file="${1}"
 
-       file ${file} 2>/dev/null | grep -q "statically linked"
+       file -L "${file}" 2>/dev/null | grep -q "statically linked"
 }
 
 update_language_list() {
@@ -1150,6 +1151,7 @@ buildipfire() {
   lfsmake2 configroot
   lfsmake2 initscripts
   lfsmake2 backup
+  lfsmake2 rust
   lfsmake2 openssl
   lfsmake2 kmod
   lfsmake2 udev
@@ -1193,6 +1195,7 @@ buildipfire() {
   # multi kernel builds so KCFG is empty
   lfsmake2 linux               KCFG=""
   lfsmake2 rtl8189es           KCFG=""
+  lfsmake2 rtl8189fs           KCFG=""
   lfsmake2 rtl8812au           KCFG=""
   lfsmake2 rtl8822bu           KCFG=""
   lfsmake2 xradio              KCFG=""
@@ -1607,11 +1610,24 @@ buildipfire() {
   lfsmake2 wireless-regdb
   lfsmake2 libsolv
   lfsmake2 ddns
+  lfsmake2 python3-pycparser
+  lfsmake2 python3-charset-normalizer
+  lfsmake2 python3-certifi
+  lfsmake2 python3-idna
+  lfsmake2 python3-requests
   lfsmake2 python3-toml
   lfsmake2 python3-pyproject2setuppy
   lfsmake2 python3-tomli
-  lfsmake2 python3-setuptools-scm
+  lfsmake2 python3-pep517
+  lfsmake2 python3-build
+  lfsmake2 python3-install
+  lfsmake2 python3-urllib3
+  lfsmake2 python3-flit
   lfsmake2 python3-packaging
+  lfsmake2 python3-typing-extensions
+  lfsmake2 python3-semantic-version
+  lfsmake2 python3-setuptools-scm
+  lfsmake2 python3-setuptools-rust
   lfsmake2 python3-six
   lfsmake2 python3-dateutil
   lfsmake2 python3-jmespath
@@ -1620,9 +1636,17 @@ buildipfire() {
   lfsmake2 python3-s3transfer
   lfsmake2 python3-rsa
   lfsmake2 python3-pyasn1
-  lfsmake2 python3-urllib3
   lfsmake2 python3-botocore
+  lfsmake2 python3-cffi
+  lfsmake2 python3-cryptography
+  lfsmake2 python3-circuitbreaker
+  lfsmake2 python3-pytz
+  lfsmake2 python3-click
+  lfsmake2 python3-arrow
+  lfsmake2 python3-terminaltables
   lfsmake2 aws-cli
+  lfsmake2 oci-python-sdk
+  lfsmake2 oci-cli
   lfsmake2 transmission
   lfsmake2 mtr
   lfsmake2 minidlna
@@ -1655,7 +1679,7 @@ buildipfire() {
   lfsmake2 perl-Font-TTF
   lfsmake2 perl-IO-String
   lfsmake2 perl-PDF-API2
-  lfsmake2 squid-accounting
+  lfsmake2 proxy-accounting
   lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
@@ -1809,7 +1833,7 @@ done
 # See what we're supposed to do
 case "$1" in
 build)
-       START_TIME=$(now)
+       START_TIME="${SECONDS}"
 
        # Clear screen
        ${INTERACTIVE} && clear
@@ -1854,7 +1878,7 @@ build)
        tools/checkrootfiles
        cd $PWD
 
-       print_build_summary $(( $(now) - ${START_TIME} ))
+       print_build_summary $(( SECONDS - START_TIME ))
        ;;
 shell)
        # enter a shell inside LFS chroot