ncurses-compat: Fix BLAKE2 checksum

[people/mfischer/ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index d4c3df5352b4594be50903a6078e33313e844cf1..6ee44ce35fb1f0b91c4e36866ec0a989e3ff44ca 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -13,7 +13,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -157,7 +157,11 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
 
 # Rust
-RUST_ARCH  = $(BUILD_ARCH)
+ifeq "$(BUILD_ARCH)" "riscv64"
+       RUST_ARCH = riscv64gc
+else
+       RUST_ARCH = $(BUILD_ARCH)
+endif
 
 ifeq "$(BUILD_ARCH)" "armv6l"
        RUST_PLATFORM = arm-unknown-linux-gnueabi
@@ -205,9 +209,15 @@ CARGO = \
        --offline
 
 CARGO_OPTIONS = \
-       $(MAKETUNING) \
        -Z avoid-dev-deps
 
+# Cargo dealocks on riscv64 when building on multiple cores at the same time
+ifeq "$(BUILD_ARCH)" "riscv64"
+       CARGO_OPTIONS += -j1
+else
+       CARGO_OPTIONS += $(MAKETUNING)
+endif
+
 define CARGO_PREPARE
        mkdir -p $(CARGO_PATH) && \
        echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \
@@ -244,7 +254,7 @@ endef
 # Common Macro Definitions
 ###############################################################################
 
-# For each package we create a list of files that it installed under 
+# For each package we create a list of files that it installed under
 # log/<TARGET> name. Modified files are not identified
 #
 define FIND_FILES
@@ -337,14 +347,13 @@ endef
 define LOAD
        @echo -e "$(MESSAGE)Download: $($(notdir $@))"
        wget -T 60 -t 1 -nv -U "IPFireSourceGrabber/2.x" $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
-       [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ] # detect page not found answer
+       [ "$($(notdir $@)_BLAKE2)" = "$(firstword $(shell b2sum $(DIR_TMP)/$(notdir $@))" ] # detect page not found answer
        mv $(DIR_TMP)/$(notdir $@) $(DIR_DL)
 endef
 
-define MD5
+define B2SUM
        # error mean file signature don't match the one in lfs script
-       [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]
-       echo "$@ checksum OK"
+       [ "$($@_BLAKE2)" = "$(firstword $(shell b2sum $(DIR_DL)/$@))" ] && echo "$@ checksum OK"
 endef
 
 define PAK