X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Frust;h=7ff84379ba009f62cc4fc0698b076147e7156b83;hp=95059906919c1c706c60ff92a7e359a176b69847;hb=HEAD;hpb=52d57e97483ba466b0f23fa9eb524eb4b6288ba0

diff --git a/lfs/rust b/lfs/rust
index 9505990691..d0a200d574 100644
--- a/lfs/rust
+++ b/lfs/rust
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2023  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        #
@@ -24,28 +24,16 @@
 
 include Config
 
-VER        = 1.37.0
+VER        = 1.67.0
+
+# From https://forge.rust-lang.org/infra/other-installation-methods.html#standalone-installers
 
 THISAPP    = rust-$(VER)
-DL_FILE    = $(THISAPP)-$(RUST_BOOTSTRAP).tar.gz
+DL_FILE    = $(THISAPP)-$(RUST_PLATFORM).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)-$(RUST_BOOTSTRAP)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)-$(RUST_PLATFORM)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-SUP_ARCH   = none
-
-ifeq "$(BUILD_ARCH)" "i586"
-	RUST_ARCH = i686
-else
-	RUST_ARCH = $(BUILD_ARCH)
-endif
-
-ifeq "$(BUILD_ARCH)" "armv5tel"
-	RUST_BOOTSTRAP = arm-unknown-linux-gnueabi
-else
-	RUST_BOOTSTRAP = $(RUST_ARCH)-unknown-linux-gnu
-endif
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -54,10 +42,10 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_MD5 =  3f84df04bd0cf0ea4668390be263945e
-$(THISAPP)-i686-unknown-linux-gnu.tar.gz_MD5 =    29411d7420184ad51f99339b2e2cf20a
-$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_MD5 = 28f9556a3febd2d38c0ba97337d56cb8
-$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_MD5 = 970ad24c516394466e7b8ca40689ee76
+$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_BLAKE2 = 3409ed876f430ff22eff792fe9f4a4ca8457f26411def368b8d7fa5b854719c4c1feac5e054d7bccbcc3568bd3601a0e579df8b3bcf5b20c660bb7af4dbbb8f8
+$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_BLAKE2 = 82c17813fbb4a48451a207dbc7879bd7239e947e249ad24e6e098bd2e250cd8aae79ab37bbc2549cb9ffc3e24ef6e072380bbcaf8a620b02457db24f328d92ea
+$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_BLAKE2 = d099645796f46769e15520b15771bb1886ee040bbee9de00f4983e8fe56c945a9afe1bded33f80c9196354d720ef09588d24468a751a8e2512688fef47a33496
+$(THISAPP)-riscv64gc-unknown-linux-gnu.tar.gz_BLAKE2 = e5b0efa7114840535d5a0934a22510e850b05eb339eab42e561717281da993817df2e0a57082d73ed7898001885e4dbabcce1ebfaec611cf125e51acd5d75e8a
 
 install : $(TARGET)
 
@@ -65,10 +53,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -77,8 +65,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -89,9 +77,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
 	cd $(DIR_APP) && ./install.sh \
-		--components=cargo,rustc,rust-std-$(RUST_BOOTSTRAP) \
+		--components=cargo,rustc,rust-std-$(RUST_PLATFORM) \
 		--prefix=/usr \
 		--disable-ldconfig
 
+	# Remove LLVM tools
+	rm -vf /usr/lib/rustlib/$(RUST_PLATFORM)/bin/rust-ll{d,vm-dwp}
+
+	# Create local registry
+	mkdir -pv $(CARGO_REGISTRY)
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)