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)