From patchwork Tue Feb 1 13:52:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5026 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wn46yCz3wp0 for ; Tue, 1 Feb 2022 13:52:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wl2Zx7z4R9; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl1952z32K9; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wj5wtGz2xLF for ; Tue, 1 Feb 2022 13:52:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wh6S1pzTp; Tue, 1 Feb 2022 13:52:52 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=p/Cuhdp7r7+DbhRNPauIsifr2goIsPl/LYY8uh3+oQk=; b=bhqFOMaDprr2DCtFmyoj0D4I75WA6g4MD2y+OC3PKfBzfIklCH0+WbpS3+UbZhUTC+A2Nc DNbH93CT7Gvrf+AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=p/Cuhdp7r7+DbhRNPauIsifr2goIsPl/LYY8uh3+oQk=; b=KKeB9u4FvYTuHe2YNPiaSgMOmheJ/H2skZf91leBTyl7gkUtiqTSq4bODgs5kETw2mbqAy mHZTnHpwwQT3/MCsFbGT2+6+rCn3XMtkMwuvO17wBigi4zna271OJXn2UrxC3CcKt5xggd Uw5Xp8oiw6dysLV08if7PUxUabVik35flcnHLuraIW5T/Bpu+ScyuHgxDVMxZF5Sjnzrfc zT6qPviV2OfCLyS4Pbne+0jKqLlCgjb4FGOhTDO5bV4zmWtMINMbeRf6tSAclDw00fEi+o OJCIW/HZhfTCrzgwVyPlQ8j5PSFrMNQ9kXhUTbGnCkMJndo5HeRPlsSoknf34w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 01/10] make.sh: Set a good default for rustc flags Date: Tue, 1 Feb 2022 13:52:37 +0000 Message-Id: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- make.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 378cd35eb..5f22f7409 100755 --- a/make.sh +++ b/make.sh @@ -170,7 +170,6 @@ configure_build() { 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) @@ -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 From patchwork Tue Feb 1 13:52:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5027 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wr56lmz3wp0 for ; Tue, 1 Feb 2022 13:53:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wl43tjzTp; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl1pr4z30b1; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wj6fszz2xVY for ; Tue, 1 Feb 2022 13:52:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wj3Yrsz2DC; Tue, 1 Feb 2022 13:52:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uKsFT+FIbgLFxt9kwHDfzoJhtfzaie08zm8hb8Y64Cc=; b=aJTiyU0cFIGB0dhFML9evJbhuuHLPctLJASutDXOmbzmA+HNtS0UwvNUQb2yLsQWu7qind 3s0dEodMDDRJtADw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uKsFT+FIbgLFxt9kwHDfzoJhtfzaie08zm8hb8Y64Cc=; b=XIwPMDtqsdiBgo14AYvHHJ+mAmTf+M81dtnWaCvY19VMoXz3XCFQCSQBkGeE1n+c57+WDP 6awFVYJF/pFe/buJjTcVSJBB0YROW4raPio0FHOKAa7yqtOrZznYpSK1zDN+Sgg0SAZbfb Cb5CODOF2nWuEE6gk8UErR08LuiwuwFDDxXCATVVTxpPfRqrnMKyqCf1YCWyDh5HZ7+ILv wbkVYhOJQ30x8tG5M9kFxwTJxIoqOMfSwnNZA2NFwa0xHnzfQD6LpkzwPyXmLNMIS1vxlD GLALpH5SaEDjXbeRQ0kpA3i38/quV51rfvhnQ04S2B476SRvAWjKGSXuKZtJIw== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 02/10] jq: New package Date: Tue, 1 Feb 2022 13:52:38 +0000 Message-Id: <20220201135246.4096955-2-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This allows parsing JSON strings on the console Signed-off-by: Michael Tremer --- config/rootfiles/common/jq | 14 +++++++ lfs/jq | 81 ++++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 96 insertions(+) create mode 100644 config/rootfiles/common/jq create mode 100644 lfs/jq diff --git a/config/rootfiles/common/jq b/config/rootfiles/common/jq new file mode 100644 index 000000000..7413eb883 --- /dev/null +++ b/config/rootfiles/common/jq @@ -0,0 +1,14 @@ +usr/bin/jq +#usr/include/jq.h +#usr/include/jv.h +#usr/lib/libjq.a +#usr/lib/libjq.la +#usr/lib/libjq.so +usr/lib/libjq.so.1 +usr/lib/libjq.so.1.0.4 +#usr/share/doc/jq +#usr/share/doc/jq/AUTHORS +#usr/share/doc/jq/COPYING +#usr/share/doc/jq/README +#usr/share/doc/jq/README.md +#usr/share/man/man1/jq.1 diff --git a/lfs/jq b/lfs/jq new file mode 100644 index 000000000..067063e1f --- /dev/null +++ b/lfs/jq @@ -0,0 +1,81 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2020 IPFire Team # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.6 + +THISAPP = jq-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = e68fbd6a992e36f1ac48c99bbf825d6b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --without-oniguruma + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5f22f7409..fca4b24c0 100755 --- a/make.sh +++ b/make.sh @@ -1129,6 +1129,7 @@ buildbase() { lfsmake2 util-linux lfsmake2 vim lfsmake2 e2fsprogs + lfsmake2 jq } buildipfire() { From patchwork Tue Feb 1 13:52:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5028 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wr71Vdz3xHT for ; Tue, 1 Feb 2022 13:53:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wl5xxPz2L8; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl2HDdz32KP; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wk0Z3Vz2xLF for ; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wj6DMTzTp; Tue, 1 Feb 2022 13:52:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ektPpxvRs5tkqk8rbKOTsgjspf3BnXUgFZsJ88W5PlI=; b=m7tlXZZU0ZgsWm/gFIL35T9+uGH9WTyQS0HuCtQkOg4DVevhrQ1EiZQCX0Jeb+/X/v/qTf nA3p4WotTKp+qzBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ektPpxvRs5tkqk8rbKOTsgjspf3BnXUgFZsJ88W5PlI=; b=RK9S1IBH5b1zdVZVMagVT3c/1Y4pLmHNcnXmOuot6zcT39YSlqhnbkYVXoy2y8AHfGgsSv r4fb9/07GUp/ohVUCktKLS/gocrNmn3wv8wCHyepsQqDPpsqI+Hf9TIFjrlRjLmBHkWbtA 0lZaQMKWPxisZF837vsdrV0KkMzuP9DUoWkUIymHoza+Ny/Gxg9QV3CHFs2/DGNZohBW75 KO50Yv2i5Ax0ECmJtvfy31DDLbXzlTipllNYITPw4kbQmyyLz/KWh35wpXPyTEh2jxbC6o uUz/Up7ymsL17FTKO/xiWtxujt9TslP5HcDa6+As2kYLqltmB+pLVFQlEE+m/A== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 03/10] make.sh: Add some commands to build Rust packages Date: Tue, 1 Feb 2022 13:52:39 +0000 Message-Id: <20220201135246.4096955-3-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is a small set of commands that will be needed to build Rust packages. The idea is to have a couple of macros which do not have to rewritten, but can be customised across the lfs files. Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/rust | 1 + config/rootfiles/common/armv6l/rust | 1 + config/rootfiles/common/x86_64/rust | 1 + lfs/Config | 80 +++++++++++++++++++++++++++- lfs/rust | 3 ++ 5 files changed, 84 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/common/aarch64/rust b/config/rootfiles/common/aarch64/rust index c26d4591b..f51308f7a 100644 --- a/config/rootfiles/common/aarch64/rust +++ b/config/rootfiles/common/aarch64/rust @@ -64,6 +64,7 @@ #usr/lib/rustlib/rust-installer-version #usr/lib/rustlib/uninstall.sh #usr/libexec/cargo-credential-1password +#usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE #usr/share/doc/cargo/LICENSE-MIT diff --git a/config/rootfiles/common/armv6l/rust b/config/rootfiles/common/armv6l/rust index ffe8318ab..7b374d94d 100644 --- a/config/rootfiles/common/armv6l/rust +++ b/config/rootfiles/common/armv6l/rust @@ -59,6 +59,7 @@ #usr/lib/rustlib/rust-installer-version #usr/lib/rustlib/uninstall.sh #usr/libexec/cargo-credential-1password +#usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE #usr/share/doc/cargo/LICENSE-MIT diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust index 6f4c7fd45..5b5080e00 100644 --- a/config/rootfiles/common/x86_64/rust +++ b/config/rootfiles/common/x86_64/rust @@ -62,6 +62,7 @@ #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-ca628c5eca5e5caf.rlib #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-5c4d6c9d7595f844.rlib #usr/libexec/cargo-credential-1password +#usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE #usr/share/doc/cargo/LICENSE-MIT diff --git a/lfs/Config b/lfs/Config index 76a07b088..d7a59c5a6 100644 --- a/lfs/Config +++ b/lfs/Config @@ -34,6 +34,18 @@ unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR unexport XZ_OPT +# Basic Variables +EMPTY := +COMMA := , +SPACE := $(EMPTY) $(EMPTY) +define NEWLINE + + +endef + +# Basic Functions +join-with = $(subst $(SPACE),$(1),$(strip $(2))) + PARALLELISM = $(shell echo $$( \ if [ -n "$(MAX_PARALLELISM)" ] && [ $(MAX_PARALLELISM) -lt 1 ]; then \ echo 1 ; \ @@ -140,7 +152,71 @@ ifeq "$(BUILD_ARCH)" "aarch64" endif # Rust -export CARGOPATH = $(HOME)/.cargo +CARGO_PATH = $(DIR_APP)/.cargo +CARGO_REGISTRY = /usr/share/cargo/registry + +CRATE_NAME = $(patsubst rust-%,%,$(firstword $(MAKEFILE_LIST))) +CRATE_VER = $(VER) +CRATE_PATH = $(CARGO_REGISTRY)/$(CRATE_NAME)-$(CRATE_VER) + +define CARGO_CONFIG +[build] +rustflags = [$(call join-with,$(COMMA)$(SPACE),$(foreach flag,$(RUSTFLAGS),"$(flag)"))] + +[env] +CFLAGS = "$(CFLAGS)" +CXXFLAGS = "$(CXXFLAGS)" +LDFLAGS = "$(LDFLAGS)" + +[term] +verbose = true + +[source] + +[source.local-registry] +directory = "$(CARGO_REGISTRY)" + +[source.crates-io] +registry = "https://crates.io" +replace-with = "local-registry" +endef +export CARGO_CONFIG + +CARGO = \ + CARGOPATH=$(CARGO_PATH) \ + cargo + +define CARGO_PREPARE + mkdir -p $(CARGO_PATH) && \ + echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \ + rm -f Cargo.lock +endef + +CARGO_BUILD = \ + $(CARGO) \ + build \ + $(MAKETUNING) \ + --release + +# Checks whether this crate has a right taregt +CARGO_TARGET_CHECK = cargo metadata --format-version 1 | \ + jq -e ".packages[].targets[].kind | any(. == \"$(1)\")" | grep -q "true" + +define CARGO_INSTALL + mkdir -pv "$(CRATE_PATH)" && \ + if $(call CARGO_TARGET_CHECK,lib); then \ + awk \ + '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' \ + < Cargo.toml > Cargo.toml.deps && \ + $(CARGO) package -l | grep -wEv "Cargo.(lock|toml.orig)" \ + | xargs -d "\n" cp --parents -a -t $(CRATE_PATH) && \ + install -v -m 644 Cargo.toml.deps $(CRATE_PATH)/Cargo.toml && \ + echo "{\"files\":{},\"package\":\"\"}" > $(CRATE_PATH)/.cargo-checksum.json; \ + fi && \ + if $(call CARGO_TARGET_CHECK,bin); then \ + $(CARGO) install --no-track --path .; \ + fi +endef ############################################################################### # Common Macro Definitions @@ -183,7 +259,7 @@ define POSTBUILD @echo "Updating linker cache..." @type -p ldconfig >/dev/null && ldconfig || : @echo "Install done; saving file list to $(TARGET) ..." - @rm -rf $(GOPATH) $(CARGOPATH) + @rm -rf $(GOPATH) @$(FIND_FILES) > $(DIR_SRC)/lsalrnew @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr diff --git a/lfs/rust b/lfs/rust index 7ff84379b..2fbc3254e 100644 --- a/lfs/rust +++ b/lfs/rust @@ -90,5 +90,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Remove LLVM tools rm -vf /usr/lib/rustlib/$(RUST_BOOTSTRAP)/bin/rust-ll{d,vm-dwp} + # Create local registry + mkdir -pv $(CARGO_REGISTRY) + @rm -rf $(DIR_APP) @$(POSTBUILD) From patchwork Tue Feb 1 13:52:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5032 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5x12DWqz3xHT for ; Tue, 1 Feb 2022 13:53:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wm0v6dz4k1; Tue, 1 Feb 2022 13:52:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl2rRvz32KT; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wk19Qcz2xVY for ; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wk09Czz2DC; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3p3nBRN3WvROUiBzYVD39E9DfYYvg+BQsyQCdZPts2k=; b=jyywPIhUfCyW/x5CHVACqfDyDmrNmCQ60fmXkesN9IUo/i7gbtB8BYNx6tiApjF+6QPjl0 3p2R0R5DRGa7ZaDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3p3nBRN3WvROUiBzYVD39E9DfYYvg+BQsyQCdZPts2k=; b=JxYz3G5KEkb7DLjJJxuHIa+hqozkAQVyUc0CY/q/pVo3QExRT9I0ryeN6M+3wj/tyJ3IbP FvPZiPpekg/A3Mp2sePBnXc5zsXKww2hmY56j3cwSQ5a7M28uEijU1ki2ke/E/2UbRN4Vx zBM3YvXRDUhin8TvZWuxIkluIYIILF+xPSja8BD4+OXxh9eKvbo1RtpC7h9hzi/0aACyC3 rCNawwDk86Zb2CTaVsos15gI+/63urjxu7DCILA56xpGw2CMZNfgMObeujARj6NDAYGL1Q YaYPIlz+rpHyitxPmUACnBJuuUFuj0wwkBcnBolI8rDmLtJK2Z95w0iA4lDEsA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 04/10] rust: List all files copied Date: Tue, 1 Feb 2022 13:52:40 +0000 Message-Id: <20220201135246.4096955-4-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/Config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/Config b/lfs/Config index d7a59c5a6..a1e77f72c 100644 --- a/lfs/Config +++ b/lfs/Config @@ -209,7 +209,7 @@ define CARGO_INSTALL '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' \ < Cargo.toml > Cargo.toml.deps && \ $(CARGO) package -l | grep -wEv "Cargo.(lock|toml.orig)" \ - | xargs -d "\n" cp --parents -a -t $(CRATE_PATH) && \ + | xargs -d "\n" cp -v --parents -a -t $(CRATE_PATH) && \ install -v -m 644 Cargo.toml.deps $(CRATE_PATH)/Cargo.toml && \ echo "{\"files\":{},\"package\":\"\"}" > $(CRATE_PATH)/.cargo-checksum.json; \ fi && \ From patchwork Tue Feb 1 13:52:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5029 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wv4mXVz3wp0 for ; Tue, 1 Feb 2022 13:53:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wm2Sgnz5FP; Tue, 1 Feb 2022 13:52:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl3HgWz32Kc; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wk1kqBz2ytv for ; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wk0jq9z4YQ; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rNqtbsu7dZ7tV426PKqjtNUBMYDSeJjuKS3mEAQ497M=; b=hs4ZFwQlYRxxHfgkdLt5pVY5M7MbvlQW8UzESh4/Rt7OOydNPe7DK6kQIu7HUI/lSFO/eY Z8hXbcohnl+hujBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rNqtbsu7dZ7tV426PKqjtNUBMYDSeJjuKS3mEAQ497M=; b=bnapvaGeJfHChXZd7XTABQsw+Ox7CBsYhLo1IlSp1WqnROdQy2XmA9SvDsSlWEFYaflarZ 4YOryYk9s858fAjeg9ksuV7Lnb2Fcfq7NiRnKKRPKi+/Z4pi5pYrAGVe8KtntpPwn4kndZ eIY3Mz/gsLrXSVOwgj5ydGXoez/Cd4YgcW/2Go5hc0ElGdcyp44IVp/rhNhA5De8RzJKKQ aAtGUeSEaR+anZiLjjg6V9jSbNIRivmfKNSu6amWFjIrhy3ONgMenKACnJ758corWw4/rL oKDlHc3o2mYZuYdz/68PiW6DqEhz1MwEny8kU0NF2gV9mZoSzWxeV6ltCGD9BQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 05/10] rust: Avoid requiring development dependencies Date: Tue, 1 Feb 2022 13:52:41 +0000 Message-Id: <20220201135246.4096955-5-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Cargo will always require all depenendencies, even if the package is not being built against them. In order to avoid that, we will need the nightly build of the Rust compiler which supports skipping those dependencies. Signed-off-by: Michael Tremer --- lfs/Config | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lfs/Config b/lfs/Config index a1e77f72c..fb5745df0 100644 --- a/lfs/Config +++ b/lfs/Config @@ -184,7 +184,13 @@ export CARGO_CONFIG CARGO = \ CARGOPATH=$(CARGO_PATH) \ - cargo + RUSTC_BOOTSTRAP=1 \ + cargo \ + --offline + +CARGO_OPTIONS = \ + $(MAKETUNING) \ + -Z avoid-dev-deps define CARGO_PREPARE mkdir -p $(CARGO_PATH) && \ @@ -195,11 +201,11 @@ endef CARGO_BUILD = \ $(CARGO) \ build \ - $(MAKETUNING) \ - --release + --release \ + $(CARGO_OPTIONS) # Checks whether this crate has a right taregt -CARGO_TARGET_CHECK = cargo metadata --format-version 1 | \ +CARGO_TARGET_CHECK = $(CARGO) metadata --format-version 1 --no-deps | \ jq -e ".packages[].targets[].kind | any(. == \"$(1)\")" | grep -q "true" define CARGO_INSTALL @@ -214,7 +220,7 @@ define CARGO_INSTALL echo "{\"files\":{},\"package\":\"\"}" > $(CRATE_PATH)/.cargo-checksum.json; \ fi && \ if $(call CARGO_TARGET_CHECK,bin); then \ - $(CARGO) install --no-track --path .; \ + $(CARGO) install $(CARGO_OPTIONS) --no-track --path .; \ fi endef From patchwork Tue Feb 1 13:52:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5030 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5ww1P7kz3xHT for ; Tue, 1 Feb 2022 13:53:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wm4qPxz5Gg; Tue, 1 Feb 2022 13:52:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl3kKMz32Kl; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wk2VrSz2xVY for ; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wk1H3tzTp; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5nsi3wVThQQhPLfoa0Q8iwGVgGS+4qoaxTBjE9FaoIk=; b=crNJiZ6FcmgE9qvXALn8XB0Y9TM7OQYcGqH8fgWH85jCMQlFZSr4Afwfv4xmOkSOjPS/kp Ep+3U3utn2unEjBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5nsi3wVThQQhPLfoa0Q8iwGVgGS+4qoaxTBjE9FaoIk=; b=Qk0MU0zh97KZF0U1lS6ujoBFWrun6v5jS51B/g+IPHWCYX/Bvsx1GyCAWms14Xw4MF8sDh nIbMVXzLsIFFAYTg7/h3neB3rUlV3A6rZtYBMZO374JT/VHGKeY4TjwWQMi2TCsyZehUt4 icTFu6gkqG+DXajPtwfDI8dgZmYBVieMD+DGxLiZTOZJuuT8gAtsUF2x1lwc9Q382ZZsEm z7k59R6hJOzKZBeeJQC4xwWFzOd33iJWQ4TYRi4RjP2EqgmvfDCMiPzAO1KRYV8EkehbHx k23p1UiuNLcgJWJHhKpUvaYcfTx2KamdyHsIl0SpUBDP5xOw8zdcfOW/GBdKHg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 06/10] rust: Add switch to skip bin check Date: Tue, 1 Feb 2022 13:52:42 +0000 Message-Id: <20220201135246.4096955-6-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This does not seem to work very reliable, so we need manually disable this for some packages. Signed-off-by: Michael Tremer --- lfs/Config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lfs/Config b/lfs/Config index fb5745df0..3ae5425ee 100644 --- a/lfs/Config +++ b/lfs/Config @@ -182,6 +182,9 @@ replace-with = "local-registry" endef export CARGO_CONFIG +# Set to false if you want to skip the binary install step +CARGO_HAS_BIN = true + CARGO = \ CARGOPATH=$(CARGO_PATH) \ RUSTC_BOOTSTRAP=1 \ @@ -219,7 +222,7 @@ define CARGO_INSTALL install -v -m 644 Cargo.toml.deps $(CRATE_PATH)/Cargo.toml && \ echo "{\"files\":{},\"package\":\"\"}" > $(CRATE_PATH)/.cargo-checksum.json; \ fi && \ - if $(call CARGO_TARGET_CHECK,bin); then \ + if $(CARGO_HAS_BIN) && $(call CARGO_TARGET_CHECK,bin); then \ $(CARGO) install $(CARGO_OPTIONS) --no-track --path .; \ fi endef From patchwork Tue Feb 1 13:52:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5031 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5x00S8Qz3wp0 for ; Tue, 1 Feb 2022 13:53:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wn1LGJz4YQ; Tue, 1 Feb 2022 13:52:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wl44fTz32Ks; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wk32xlz30JC for ; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wk26fyz2L8; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7MEj6VBQkfDyihScCzQK02dMN+CJnc97TBLhUMVc9fg=; b=zkQRCtjCiu4mSTu9QNLup1PXgPF3ksll9oFIRmVAzpepQ3AXJ2Z1lsqt8uPxJmvTM95Ffa LtqFXsrHyceeJ5BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7MEj6VBQkfDyihScCzQK02dMN+CJnc97TBLhUMVc9fg=; b=RxiZLeXS1+45TMymh+unXUV9ImsvVz3ygm5eavJsQv++1cfvcSbtbOGPFKg/j3gDg8TS8W akliEaKjmq0skY/SugtqNu5x0BzlfmbgJBs0HXPFVgfeGOTDHmw7KEjXHpcXad8mhTObep f2/iiSmVDo6aC8GUmFdNcmZE6QbalvbdINAC4VqPfkl0Bvar2VVPEMd+kT0BZE5pXGa1VQ o95OKJVwRYbzlIepnVjbVq/TJaWPchlV39QGF+ASnLK4kf8kApt/0HVmf6NF7PXE35G75i Jrxfxau07mLYbPDykWzGNkyToATlNDrQNUICWizMHcF0Q378NKkNHpm20Bz/Eg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 07/10] rust: Enable more checks for when to install package files Date: Tue, 1 Feb 2022 13:52:43 +0000 Message-Id: <20220201135246.4096955-7-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/Config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/Config b/lfs/Config index 3ae5425ee..d2f9c4bf9 100644 --- a/lfs/Config +++ b/lfs/Config @@ -213,7 +213,7 @@ CARGO_TARGET_CHECK = $(CARGO) metadata --format-version 1 --no-deps | \ define CARGO_INSTALL mkdir -pv "$(CRATE_PATH)" && \ - if $(call CARGO_TARGET_CHECK,lib); then \ + if $(call CARGO_TARGET_CHECK,lib) || $(call CARGO_TARGET_CHECK,rlib) || $(call CARGO_TARGET_CHECK,proc-macro); then \ awk \ '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' \ < Cargo.toml > Cargo.toml.deps && \ From patchwork Tue Feb 1 13:52:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5033 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5x25rVpz3wp0 for ; Tue, 1 Feb 2022 13:53:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wn4jlxz5HT; Tue, 1 Feb 2022 13:52:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wn4Tqbz30GR; Tue, 1 Feb 2022 13:52:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wl0LKtz2xVY for ; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wk2dBBz4R9; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k2QzLTEbTsgNFtvHGgE7jRM6/m6WaaaJQXqOqu37S1A=; b=6B4GFQpf/n/zhrvYA5aEFlxe/Iqgn7nogvPVPLMVO4BAl4KD/2rX/hWZG/22Ao2Jt9DtAe L4FeA1wJXWRsL9CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k2QzLTEbTsgNFtvHGgE7jRM6/m6WaaaJQXqOqu37S1A=; b=ogINBRnam+u49i/FlW5tQXCWIrR/RL4wM2j56PAam+hBN/veD+5AhO4cBAM0/5KM93sRLP N0wzifQzWsTFnSVzMClelMP954w+N72TO8b/4mWKPYpnX3tHjCftj2ItE1I/PuBCdb0Xdg a606DdmCzDyXViR+WXOLknBrPh9VrD/t/veqGdqe6GcZmsRuZmi0E/V28FGHGT2mMeibn7 penqqAfmaWIb73cRKvkLL1vE5BJABObMZqwXgn+9B6vG3ELKe8PBzBLLwIKGO3F6FmN1hv p8nCdIU25e04GwIs+hXcn5dT0J+fH0U3rLX2CnMhJLFqbZ8tXDZjGZ2vNHWDWA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 08/10] rust: Add script to automatically generate packages Date: Tue, 1 Feb 2022 13:52:44 +0000 Message-Id: <20220201135246.4096955-8-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is a very tiring and repetitive process which is now automated in this script which will find the latest version and create a LFS file for it. Signed-off-by: Michael Tremer --- tools/download-rust-crate | 82 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100755 tools/download-rust-crate diff --git a/tools/download-rust-crate b/tools/download-rust-crate new file mode 100755 index 000000000..bae6b60be --- /dev/null +++ b/tools/download-rust-crate @@ -0,0 +1,82 @@ +#!/bin/bash + +set -o pipefail + +RUST_TEMPLATE="lfs/rust-rand" + +fetch_latest_version() { + local name="${1}" + + if ! curl --silent "https://crates.io/api/v1/crates/${name}" | \ + jq --raw-output .crate.max_stable_version; then + echo "${0}: Could not find the latest stable version of ${name}" >&2 + return 1 + fi +} + +main() { + local name="${1}" + local version="${2}" + + if [ -z "${name}" ]; then + echo "${0}: You need to pass a name of a crate" >&2 + return 2 + fi + + if [ -z "${version}" ]; then + version="$(fetch_latest_version "${name}")" + if [ -z "${version}" ]; then + # error message has already been printed + return 1 + fi + fi + + # Compose download URL + local url="https://crates.io/api/v1/crates/${name}/${version}/download" + local download="$(mktemp)" + + # Perform download + if ! curl -L "${url}" -o "${download}"; then + echo "${0}: Could not download ${name}-${version}" >&2 + unlink "${download}" + return 1 + fi + + # Check if download is an orderly tar file + if ! tar tvf "${download}" &>/dev/null; then + echo "${0}: Download is not a tar file" >&2 + unlink "${download}" + return 1 + fi + + # Hash the downloaded file + local md5sum="$(md5sum "${download}" | awk '{ print $1 }')" + if [ -z "${md5sum}" ]; then + echo "${0}: Could not hash download" >&2 + unlink "${download}" + return 1 + fi + + local filename="cache/${name}-${version}.tar.gz" + + # Move to final destination + if ! install -m 644 "${download}" "${filename}"; then + echo "${0}: Could not move downloaded file to ${filename}" >&2 + unlink "${download}" + return 1 + fi + + # Remove download + unlink "${download}" + + # Create a new LFS file + sed < "${RUST_TEMPLATE}" > "lfs/rust-${name}" \ + -e "s/^VER.*/VER = ${version}/" \ + -e "s/^THISAPP.*/THISAPP = ${name}-\$(VER)/" \ + -e "s/^\$(DL_FILE)_MD5.*/\$(DL_FILE)_MD5 = ${md5sum}/" + + echo "Done" + return 0 +} + +main "$@" || exit $? From patchwork Tue Feb 1 13:52:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5034 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5x31Xx3z3xff for ; Tue, 1 Feb 2022 13:53:11 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wn6Kw8z5MG; Tue, 1 Feb 2022 13:52:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wn4vXNz315x; Tue, 1 Feb 2022 13:52:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wl2pzMz32K7 for ; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wk72bSzTp; Tue, 1 Feb 2022 13:52:54 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qRoYJtecZ9soTXEhRnZOL9Mp/3INdaNWyXZgX+HVkrs=; b=WVOvBQbhxIV6dOm/nLUra3z916g5wJveLattX9+oe3D4ap3AbM+6llWUNruyggs7WKGdfs Z2EoAfrDTsydFNCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qRoYJtecZ9soTXEhRnZOL9Mp/3INdaNWyXZgX+HVkrs=; b=pDBZdbteRepliek/XDMYNcGe9tI5UmZYsOfPtrKOuTzBXULBE0P2Z/a4+gIHmScfywxvUc R+CkeVAltgAJStJKGh0iOj66TyWbMTbrjDvwSCRzrgcRiaVs82mDHPYc9HjK3gIk44YYMB NxLQ3pUc/fasOjXHm+i525QU/XUM/+aI/p16czAn/w5nFLIei4NtuasNttpMOD7MrLx5Tl BH/FhSoRV+a8UB+06L09YKiWO1jt8IUmkymajwUH6sXatXlvDDwd7i/kNaR4M+Ts4IfpMF DJTb4bjEyaSMYOz1zsQCu9u6FE4WUTYamWqe9l9MJZHpzbueNXsLjM5ikN5H4Q== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 09/10] rust: Upgrade to nightly build from today Date: Tue, 1 Feb 2022 13:52:45 +0000 Message-Id: <20220201135246.4096955-9-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/common/aarch64/rust | 84 +++++++++++++++------------- config/rootfiles/common/armv6l/rust | 73 +++++++++++++----------- config/rootfiles/common/x86_64/rust | 77 +++++++++++++------------ lfs/Config | 8 +++ lfs/rust | 30 ++++------ 5 files changed, 147 insertions(+), 125 deletions(-) diff --git a/config/rootfiles/common/aarch64/rust b/config/rootfiles/common/aarch64/rust index f51308f7a..b249f4fdb 100644 --- a/config/rootfiles/common/aarch64/rust +++ b/config/rootfiles/common/aarch64/rust @@ -6,48 +6,54 @@ #usr/bin/rustdoc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libchalk_derive-60c7d9b67167a9f2.so -#usr/lib/librustc_driver-d05deb70c2a826c2.so -#usr/lib/librustc_macros-6959a92dde7c0104.so -#usr/lib/libserde_derive-f6c55381d3d185eb.so -#usr/lib/libstd-78700ac2ab56c3bb.so -#usr/lib/libtest-5140f7e2ec410eb4.so -#usr/lib/libtracing_attributes-f1588bb03dae1fd1.so +#usr/lib/libchalk_derive-bc37a4d3cc7afc0c.so +#usr/lib/libcstr-42f6d4036d8672ac.so +#usr/lib/librustc_driver-11eb9d5c5cc02062.so +#usr/lib/librustc_macros-09b2561b6369ca7d.so +#usr/lib/libserde_derive-8864815e24a22baf.so +#usr/lib/libstd-bf1df1aed541d8ed.so +#usr/lib/libtest-d888e7c03fa5be21.so +#usr/lib/libtracing_attributes-f53307c6cf89c064.so #usr/lib/rustlib #usr/lib/rustlib/aarch64-unknown-linux-gnu #usr/lib/rustlib/aarch64-unknown-linux-gnu/bin +#usr/lib/rustlib/aarch64-unknown-linux-gnu/bin/gcc-ld +#usr/lib/rustlib/aarch64-unknown-linux-gnu/bin/gcc-ld/ld +#usr/lib/rustlib/aarch64-unknown-linux-gnu/bin/gcc-ld/ld64 #usr/lib/rustlib/aarch64-unknown-linux-gnu/lib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libaddr2line-228db558b4700480.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libadler-f8e203c5b1ddf98b.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liballoc-e22f07436e09e5de.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcfg_if-10f6c1cf2d7e4beb.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcompiler_builtins-81a70c8852741fae.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcore-3c0fae3704d95225.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgetopts-bf6c53d8d87e5474.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgimli-ee0753eb4294dd52.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libhashbrown-b407e6a2057ae6e3.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblibc-05c1d7ca8cdec168.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libminiz_oxide-449db24deb93dd8d.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libobject-8e2621586e9e42ed.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_abort-35141bf59368e7af.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_unwind-808231bb932c6507.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libproc_macro-52033248ff2e703e.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libprofiler_builtins-f29e4894fa03fc09.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_demangle-76d8cd0fb823c519.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-4e6c971b08227805.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_core-5291610c2695652b.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_std-f823a3559cc11aa8.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-78700ac2ab56c3bb.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-78700ac2ab56c3bb.so -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libterm-ccf3fc5c25933c6d.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-5140f7e2ec410eb4.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-5140f7e2ec410eb4.so -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunicode_width-fa2a3a9c86d3c072.rlib -#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunwind-94e50e919db6c56e.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libaddr2line-7c1446e3e87b2b09.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libadler-299819e6b3a816f3.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liballoc-005ebc4ebbf497c8.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcfg_if-8c8a3a61554c19ae.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcompiler_builtins-563a040e8905cead.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcore-ba3072fd9d1e03a2.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgetopts-5ec353a43bd92e81.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgimli-006ca31967fca06b.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libhashbrown-0aca47c72e768ead.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblibc-2afa71bd510d9f3f.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libmemchr-130cfc0a8bb148f7.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libminiz_oxide-29eccf1b0ae050d2.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libobject-cc0e548d3cbbd8f6.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_abort-d463132d20571180.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_unwind-abfc59ce51bd5da4.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libproc_macro-4dfeeacf6c120e7a.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libprofiler_builtins-d830e67ef735d81d.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-nightly_rt.asan.a +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-nightly_rt.hwasan.a +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-nightly_rt.lsan.a +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-nightly_rt.msan.a +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-nightly_rt.tsan.a +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_demangle-340189b0709e545c.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-fcfea86764e35159.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_core-5a016b349f64c169.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_std-8b467de538f00f19.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-bf1df1aed541d8ed.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-bf1df1aed541d8ed.so +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd_detect-a94bb57c38a005c0.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-d888e7c03fa5be21.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-d888e7c03fa5be21.so +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunicode_width-5a0b6b47f00cd8ee.rlib +#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunwind-dc19104919b91c81.rlib #usr/lib/rustlib/components #usr/lib/rustlib/etc #usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py @@ -64,6 +70,7 @@ #usr/lib/rustlib/rust-installer-version #usr/lib/rustlib/uninstall.sh #usr/libexec/cargo-credential-1password +#usr/share/cargo #usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE @@ -94,6 +101,7 @@ #usr/share/man/man1/cargo-package.1 #usr/share/man/man1/cargo-pkgid.1 #usr/share/man/man1/cargo-publish.1 +#usr/share/man/man1/cargo-report.1 #usr/share/man/man1/cargo-run.1 #usr/share/man/man1/cargo-rustc.1 #usr/share/man/man1/cargo-rustdoc.1 diff --git a/config/rootfiles/common/armv6l/rust b/config/rootfiles/common/armv6l/rust index 7b374d94d..39da25d4c 100644 --- a/config/rootfiles/common/armv6l/rust +++ b/config/rootfiles/common/armv6l/rust @@ -6,43 +6,48 @@ #usr/bin/rustdoc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libchalk_derive-60e6609799a3665c.so -#usr/lib/librustc_driver-d9db5d9f5168f26a.so -#usr/lib/librustc_macros-5adaaf63fffb4acc.so -#usr/lib/libserde_derive-7dfe7ef76bb583c0.so -#usr/lib/libstd-08ee4762acc7bd6c.so -#usr/lib/libtest-ab3fca57c5ff3f13.so -#usr/lib/libtracing_attributes-119e673def241fe0.so +#usr/lib/libchalk_derive-a7aac87648f67dd9.so +#usr/lib/libcstr-ca11439b0f1e1bec.so +#usr/lib/librustc_driver-8b5e0f8365ad13be.so +#usr/lib/librustc_macros-5f6bdd64c87d05ed.so +#usr/lib/libserde_derive-bbec38f041e24373.so +#usr/lib/libstd-5a81f0e7a81bb280.so +#usr/lib/libtest-3d3f7e63207b7755.so +#usr/lib/libtracing_attributes-e70e4864c8506b83.so #usr/lib/rustlib #usr/lib/rustlib/arm-unknown-linux-gnueabi #usr/lib/rustlib/arm-unknown-linux-gnueabi/bin +#usr/lib/rustlib/arm-unknown-linux-gnueabi/bin/gcc-ld +#usr/lib/rustlib/arm-unknown-linux-gnueabi/bin/gcc-ld/ld +#usr/lib/rustlib/arm-unknown-linux-gnueabi/bin/gcc-ld/ld64 #usr/lib/rustlib/arm-unknown-linux-gnueabi/lib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libaddr2line-a93e1e1d8fc43c22.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libadler-b353a1d292e49fc9.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liballoc-f19953fa31c5e53c.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcfg_if-35e2f271631dab8b.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcompiler_builtins-ddbc6586d7a17833.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcore-14499a277447f4f6.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgetopts-a643ba6ad20cd7fc.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgimli-cc1b705e5055e3a6.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libhashbrown-081221f480fdcb96.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblibc-15548400be905d1f.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libminiz_oxide-d5d80e62031eaec6.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libobject-f538e004b85c6b56.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_abort-9719b08ba8e4a62e.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_unwind-67eb8cc728beb84e.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libproc_macro-6d2282bdaf511097.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_demangle-138ccc5a7c1205f8.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_alloc-48aee1e7bcd00a8b.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_core-d7f7aed366972d31.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_std-36a49e2bcef28653.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-08ee4762acc7bd6c.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-08ee4762acc7bd6c.so -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libterm-cde6bfa2a44e2ae0.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-ab3fca57c5ff3f13.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-ab3fca57c5ff3f13.so -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunicode_width-070cf192d55ba738.rlib -#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunwind-0dfac9185d575a7e.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libaddr2line-e313097e00d59aff.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libadler-904ad4f3ea8e4644.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liballoc-8a8ca2fa8fd7e921.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcfg_if-5726f074bf370c96.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcompiler_builtins-59d656a2d77b6ff1.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcore-21d632ec5a739f36.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgetopts-3f7143b969b1dc20.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgimli-33924ee1ebd37000.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libhashbrown-1293c8e1e0e1e2ca.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblibc-e33c1d2e4e1c5607.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libmemchr-27b88fc4f04ffcea.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libminiz_oxide-5f1c39b893ff362d.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libobject-ddc4501dc811e1a0.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_abort-70c249ebcf7cabf7.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_unwind-c6741552d434440d.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libproc_macro-8bbf2a5f09c35911.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_demangle-ee45321cd0c23638.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_alloc-5f88fea53c4fd04e.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_core-16c9d9a485713471.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_std-8202290e15aa73c2.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-5a81f0e7a81bb280.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-5a81f0e7a81bb280.so +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd_detect-7a9162609ed190df.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-3d3f7e63207b7755.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-3d3f7e63207b7755.so +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunicode_width-e3650df3aaead3dd.rlib +#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunwind-2978ee66d1e38980.rlib #usr/lib/rustlib/components #usr/lib/rustlib/etc #usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py @@ -59,6 +64,7 @@ #usr/lib/rustlib/rust-installer-version #usr/lib/rustlib/uninstall.sh #usr/libexec/cargo-credential-1password +#usr/share/cargo #usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE @@ -89,6 +95,7 @@ #usr/share/man/man1/cargo-package.1 #usr/share/man/man1/cargo-pkgid.1 #usr/share/man/man1/cargo-publish.1 +#usr/share/man/man1/cargo-report.1 #usr/share/man/man1/cargo-run.1 #usr/share/man/man1/cargo-rustc.1 #usr/share/man/man1/cargo-rustdoc.1 diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust index 5b5080e00..019a89d13 100644 --- a/config/rootfiles/common/x86_64/rust +++ b/config/rootfiles/common/x86_64/rust @@ -4,13 +4,12 @@ #usr/bin/rust-lldb #usr/bin/rustc #usr/bin/rustdoc -#usr/etc #usr/etc/bash_completion.d #usr/etc/bash_completion.d/cargo -#usr/lib/libLLVM-11-rust-1.51.0-stable.so -#usr/lib/librustc_driver-7ea116e55de24565.so -#usr/lib/libstd-b1047a2788193be4.so -#usr/lib/libtest-db2b7a6bef408fa0.so +#usr/lib/libLLVM-13-rust-1.60.0-nightly.so +#usr/lib/librustc_driver-aa47d0f7d4285ece.so +#usr/lib/libstd-516357af627e1a7d.so +#usr/lib/libtest-99495cca8bccf19c.so #usr/lib/rustlib #usr/lib/rustlib/components #usr/lib/rustlib/etc @@ -29,39 +28,44 @@ #usr/lib/rustlib/uninstall.sh #usr/lib/rustlib/x86_64-unknown-linux-gnu #usr/lib/rustlib/x86_64-unknown-linux-gnu/bin +#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld +#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/ld +#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/gcc-ld/ld64 #usr/lib/rustlib/x86_64-unknown-linux-gnu/lib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-4b4efaa8c4601753.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-eaad965909c4200f.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-d4ef8bf89076ed01.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-2642d2bccc00517a.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-e2523c360f03ba10.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-3aaf8f932781f33e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-95dbee16e1f1413e.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-d36e07ed2cc56ee4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-58a065cdff5508a2.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-760e48b3f782e7f5.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-c6b02b522c91c060.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-dca728ac8ed54d87.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-e64bb1b2baa83853.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-e8e399e2092f3b2a.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-54c67f2a732d07c8.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-3d6f66b0d6604f40.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-3855d04b1bb40ceb.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-82aeeedcc8d1450a.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-36070e2029bb21ea.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-bb10221986b0d0dc.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-b1047a2788193be4.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-b1047a2788193be4.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm-48aa4fef4e05ebc9.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-db2b7a6bef408fa0.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-db2b7a6bef408fa0.so -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-ca628c5eca5e5caf.rlib -#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-5c4d6c9d7595f844.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-02ebc04a72bd9433.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-5a532766d1e80b5b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-ffaac76756e3f83b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-b3d84848ab790cf7.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-f98cce041f593917.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-0e3656b1fda5fd7b.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-77187b6b5d97d3f9.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-5cbc32ae14534ca9.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-c79b77d9c2e73c7a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-f48e57d6d73020ee.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-d995c6cafdb3d253.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-c94e3d0069d19330.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-d08f0c83526179dc.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-f2a00a4b18a6afb5.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-9cb5ef8235cf10de.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-275d566364a3bbaa.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-04b3e9d05bd6d948.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-nightly_rt.asan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-nightly_rt.lsan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-nightly_rt.msan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-nightly_rt.tsan.a +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-7f98f837d3579544.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-c7b2792f3bc0d0eb.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-2a6a2797f7a73818.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-79fa9b4a33efec6c.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-516357af627e1a7d.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-516357af627e1a7d.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-969ebc8623abfcc9.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-99495cca8bccf19c.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-99495cca8bccf19c.so +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-726cf7a6ceb83d9a.rlib +#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-7558dde8464d46ce.rlib #usr/libexec/cargo-credential-1password +#usr/share/cargo #usr/share/cargo/registry #usr/share/doc/cargo #usr/share/doc/cargo/LICENSE-APACHE @@ -92,6 +96,7 @@ #usr/share/man/man1/cargo-package.1 #usr/share/man/man1/cargo-pkgid.1 #usr/share/man/man1/cargo-publish.1 +#usr/share/man/man1/cargo-report.1 #usr/share/man/man1/cargo-run.1 #usr/share/man/man1/cargo-rustc.1 #usr/share/man/man1/cargo-rustdoc.1 diff --git a/lfs/Config b/lfs/Config index d2f9c4bf9..663410677 100644 --- a/lfs/Config +++ b/lfs/Config @@ -152,6 +152,14 @@ ifeq "$(BUILD_ARCH)" "aarch64" endif # Rust +RUST_ARCH = $(BUILD_ARCH) + +ifeq "$(BUILD_ARCH)" "armv6l" + RUST_PLATFORM = arm-unknown-linux-gnueabi +else + RUST_PLATFORM = $(RUST_ARCH)-unknown-linux-gnu +endif + CARGO_PATH = $(DIR_APP)/.cargo CARGO_REGISTRY = /usr/share/cargo/registry diff --git a/lfs/rust b/lfs/rust index 2fbc3254e..bfb114d70 100644 --- a/lfs/rust +++ b/lfs/rust @@ -24,23 +24,17 @@ include Config -VER = 1.51.0 +VER = 2022-01-27 -THISAPP = rust-$(VER) -DL_FILE = $(THISAPP)-$(RUST_BOOTSTRAP).tar.gz +# From https://static.rust-lang.org/dist/2022-01-27/ + +THISAPP = rust-nightly-$(VER) +DL_FILE = $(THISAPP)-$(RUST_PLATFORM).tar.xz DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP)-$(RUST_BOOTSTRAP) +DIR_APP = $(DIR_SRC)/rust-nightly-$(RUST_PLATFORM) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = x86_64 aarch64 armv6l -RUST_ARCH = $(BUILD_ARCH) - -ifeq "$(BUILD_ARCH)" "armv6l" - RUST_BOOTSTRAP = arm-unknown-linux-gnueabi -else - RUST_BOOTSTRAP = $(RUST_ARCH)-unknown-linux-gnu -endif - ############################################################################### # Top-level Rules ############################################################################### @@ -49,9 +43,9 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-x86_64-unknown-linux-gnu.tar.gz_MD5 = efc4d147e25918e60678a69fcaf67b55 -$(THISAPP)-aarch64-unknown-linux-gnu.tar.gz_MD5 = e85e1758b9770bae16c253825e2ecf9c -$(THISAPP)-arm-unknown-linux-gnueabi.tar.gz_MD5 = da4fa1b2bd21dc6d2d7e791d8faaa3eb +$(THISAPP)-x86_64-unknown-linux-gnu.tar.xz_MD5 = 42ae351e32e3d570c2c1612c9a9037ee +$(THISAPP)-aarch64-unknown-linux-gnu.tar.xz_MD5 = 70504d2ad8ec793672d54c64e5c74593 +$(THISAPP)-arm-unknown-linux-gnueabi.tar.xz_MD5 = a6dfbd26b7057260ee07c15afa325b9f install : $(TARGET) @@ -80,15 +74,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(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_BOOTSTRAP)/bin/rust-ll{d,vm-dwp} + rm -vf /usr/lib/rustlib/$(RUST_PLATFORM)/bin/rust-ll{d,vm-dwp} # Create local registry mkdir -pv $(CARGO_REGISTRY) From patchwork Tue Feb 1 13:52:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5035 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5x53hlSz3wp0 for ; Tue, 1 Feb 2022 13:53:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jp5wp2S7kz5Mt; Tue, 1 Feb 2022 13:52:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jp5wn5MzKz315y; Tue, 1 Feb 2022 13:52:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jp5wl3dm0z315y for ; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jp5wl2QWRz2DC; Tue, 1 Feb 2022 13:52:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643723575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OfEjLq6p2HFMwungQFjtw5oQtLIvTxIRxoodUicNTB8=; b=FhUER69zBx9mePuwZeyo5txgi2kGKszmZC9R+dH4CXo7JqLCYpVpSpSSEJrovkAkh6YiCX SoNn/Cv1zQ1eRjDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643723575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OfEjLq6p2HFMwungQFjtw5oQtLIvTxIRxoodUicNTB8=; b=WWPGMgkILGEf6oGBFsDI8uchjrQl1D8hCVnTiHTT0/qsJ7jJeNCkNL33HVFUViNXRXwXNW +SaPXrmZuslCSG/e86V1udu82kPCB5i2A7H5xIiCD/1oAFdbF1WipWk0QOHr/MibK19VXg n78dC/wOUw0AmqEWe3VWG/ja/wzI5uqi/b5Cf7Aif72AgrGQBeqTSEIIJsoCUBDnnZ+a9o /0kRP5d/b3Q87O9+/zBCNsGFBIcc7pWwQ7/2wqfMNk1cWdY3NGjCsyoQbcpjLqAUG1Xyre LZkvvbGYkPDj/P3c6/l3sRKcjuK2w4kP2YtYG0VlYNUHrP73f/NoCC+WZr8xyA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 10/10] Config: Remove /root/.cargo Date: Tue, 1 Feb 2022 13:52:46 +0000 Message-Id: <20220201135246.4096955-10-michael.tremer@ipfire.org> In-Reply-To: <20220201135246.4096955-1-michael.tremer@ipfire.org> References: <20220201135246.4096955-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- lfs/Config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/Config b/lfs/Config index 663410677..3e4de3b3f 100644 --- a/lfs/Config +++ b/lfs/Config @@ -276,7 +276,7 @@ define POSTBUILD @echo "Updating linker cache..." @type -p ldconfig >/dev/null && ldconfig || : @echo "Install done; saving file list to $(TARGET) ..." - @rm -rf $(GOPATH) + @rm -rf $(GOPATH) /root/.cargo @$(FIND_FILES) > $(DIR_SRC)/lsalrnew @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr