| Message ID | 20250422074738.821755-4-elmehdi.younes@smile.fr |
|---|---|
| State | New |
| Headers | show
Return-Path: <buildroot-bounces@buildroot.org> X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ZhZ8s026xz1yMZ for <incoming-buildroot@patchwork.ozlabs.org>; Tue, 22 Apr 2025 17:47:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 47E7281B35; Tue, 22 Apr 2025 07:48:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id OQyyPl9E6i4e; Tue, 22 Apr 2025 07:48:12 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=<UNKNOWN> DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6C2C381B6D Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id 6C2C381B6D; Tue, 22 Apr 2025 07:48:12 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists1.osuosl.org (Postfix) with ESMTP id 22BA71A0 for <buildroot@buildroot.org>; Tue, 22 Apr 2025 07:48:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 141C96067F for <buildroot@buildroot.org>; Tue, 22 Apr 2025 07:48:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 9e74I5_LYlUU for <buildroot@buildroot.org>; Tue, 22 Apr 2025 07:48:09 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::336; helo=mail-wm1-x336.google.com; envelope-from=elmehdi.younes@smile.fr; receiver=<UNKNOWN> DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org F29C660C1C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F29C660C1C Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by smtp3.osuosl.org (Postfix) with ESMTPS id F29C660C1C for <buildroot@buildroot.org>; Tue, 22 Apr 2025 07:48:08 +0000 (UTC) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43d0618746bso35736125e9.2 for <buildroot@buildroot.org>; Tue, 22 Apr 2025 00:48:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745308087; x=1745912887; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZNyIST87hSmbuEVezJEAzjGavNKryEH7zfh2i42BQLQ=; b=sZwrfiPAPyJp0AIPuYJBG6wg459AAP3eIfXVfTOJCRXtWCqv/ne8X1cr2sjUjU/Uc/ kNmE2aFOeytv6uyUu0wVhhc3iJhE9NvOUqG1BYGbk4bNkYuskr0cm4w9GbcUu/b3cKKS Kgh9pg7U0hjxNvCK7m7H0EEpqoP3WZW3QTxPQ1Otol+8cygKSn0YoXCC/6Jqr6f6UhJv uiCAX4rbbOl6LCrgJ8X7Td10l0/jIZmAvoSRD426WiqfSAxs3In6+XGO7aU6BUDciVci QymmpQgV3d/ucLlxMLFbPq/ReYTepSz9tczPK5qRvLeN1ANN5ANfJQO51846d2UEWQnW bgWQ== X-Gm-Message-State: AOJu0YzHObFsoX/WjiY5zE+4gSgPGsl8mAv6IdceRa20cbzx5vwgKXQo o6yTAu7daPiU/Bs7DWBBJxqSEUSTser83ZFLelgvmY2kJ4mdfEz78SWIcJqmETYNgf4CgK1r91u nqjE= X-Gm-Gg: ASbGncsnw0TNOhI1UHcWyng1Hmr92cB9GsAYJHyTsLsgDoQqVKu7T3hBnYJ9FQw7ab6 kailvAfTt9njb3TgjnHclK+YMkuG0zoSEqX7pQwyram1ZPNcDyUI0m4xR5u9YDPo65m51mUF4GW 5lW4+awPXe5Jery/e7rJCEbYyP0jm1/wMWor2H51UsBVd6mOGkFmpCmr3QBz2Bs1I8ChtB9X1hq fB6x/8gfMMFvbNptYxxPhorjHyAP3aSzYOdJ5W88/9RQP5itQjVuNw3QjOPFFl3UjLwsPz0KfyS 9y2jRNn9WZdNqc0eWQxy3jLSgHFjSPf3VeRq9o+5Qjbh6LPYAOuqEA0bO7w6KZETiU4OEDXruN2 crCZ7/vQQlf7C+KRKwuMtsDw4i4FDEleIe0w= X-Google-Smtp-Source: AGHT+IGaGWjOpgKl/jqxAHSD6sXsCEhvszmaGNcjEWQBVbuImyvj4roxJS3aP7SzvzTgdV+ZJX3UPA== X-Received: by 2002:a05:600c:1e88:b0:43d:10c:2f60 with SMTP id 5b1f17b1804b1-4406ac0a847mr105445895e9.24.1745308086832; Tue, 22 Apr 2025 00:48:06 -0700 (PDT) Received: from P-NAN-ABRICOT.. (static-css-ccs-204145.business.bouyguestelecom.com. [176.157.204.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4406d5bbd8asm162913405e9.23.2025.04.22.00.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 00:48:06 -0700 (PDT) To: buildroot@buildroot.org Date: Tue, 22 Apr 2025 09:47:37 +0200 Message-ID: <20250422074738.821755-4-elmehdi.younes@smile.fr> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422074738.821755-1-elmehdi.younes@smile.fr> References: <20250422074738.821755-1-elmehdi.younes@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile.fr; s=google; t=1745308087; x=1745912887; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZNyIST87hSmbuEVezJEAzjGavNKryEH7zfh2i42BQLQ=; b=G8Quk8fzOE/pfhmYwaUDKCVuCPU5cqI76PncXHcansJsXq5zkOLY3dj9tTE7LtLL68 3tI6BIWDywNF9Z5VMy6Hi8bf8PPJOE6+mWPrmEnGEz/nvFKDvHFesGhDdr5p+Ub16m8J Go4bqQd7aJe90tsgXpPf9o9HTGZnLBzuQ1tiY= X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=reject dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=smile.fr header.i=@smile.fr header.a=rsa-sha256 header.s=google header.b=G8Quk8fz Subject: [Buildroot] [PATCH 3/4] package/pkg-download: switch from cargo2 to cargo3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot <buildroot.buildroot.org> List-Unsubscribe: <https://lists.buildroot.org/mailman/options/buildroot>, <mailto:buildroot-request@buildroot.org?subject=unsubscribe> List-Archive: <http://lists.buildroot.org/pipermail/buildroot/> List-Post: <mailto:buildroot@buildroot.org> List-Help: <mailto:buildroot-request@buildroot.org?subject=help> List-Subscribe: <https://lists.buildroot.org/mailman/listinfo/buildroot>, <mailto:buildroot-request@buildroot.org?subject=subscribe> From: El Mehdi YOUNES via buildroot <buildroot@buildroot.org> Reply-To: El Mehdi YOUNES <elmehdi.younes@smile.fr> Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>, Joseph Kogut <joseph.kogut@gmail.com>, David Pierret <david.pierret@smile.fr>, Danilo Bargen <mail@dbrgn.ch>, Graeme Smecher <gsmecher@threespeedlogic.com>, James Hilliard <james.hilliard1@gmail.com>, Sam Voss <sam.voss@gmail.com>, Torben Voltmer <mail@t-voltmer.net>, El Mehdi YOUNES <elmehdi.younes@smile.fr>, Saeed Kazemi <kazemi.ms@gmail.com>, Alex Michel <alex.michel@wiedemann-group.com>, Leo Yu-Chi Liang <ycliang@andestech.com>, Mika Westerberg <mika.westerberg@linux.intel.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" <buildroot-bounces@buildroot.org> |
| Series |
package/rust: rust upgrade to version 1.86.0
|
expand
|
diff --git a/package/pkg-download.mk b/package/pkg-download.mk index cf5959ea95..bbb3501643 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -12,7 +12,7 @@ BR_FMT_VERSION_git = -git4 BR_FMT_VERSION_svn = -svn5 BR_FMT_VERSION_go = -go2 -BR_FMT_VERSION_cargo = -cargo2 +BR_FMT_VERSION_cargo = -cargo3 DL_WRAPPER = support/download/dl-wrapper
Starting from rust 1.84.0 (cargo 1.84.0), published crates now always include a Cargo.lock file. Originally it was only included for packages that have executables or examples for use with cargo install. see [1] This behaviour change alters the contents of the .tar.gz archives, which causes SHA256 hash mistmatches when trying to build Rust packages. Example build failure with bat-0.24.0: ERROR: while checking hashes from package/bat/bat.hash ERROR: bat-0.24.0-cargo2.tar.gz has wrong sha256 hash: ERROR: expected: 45fcdd6076dc1b45698a7b6c0f4d1f5d9ae676f3ca3b155402ad24680d5b4df6 ERROR: got : 28b302b1aa325221796d4ebb25bacab19a8927ef32f4d56a965b32a7b1c102fc After using the ne hash to download the new archive tar.gz, we have the difference between the old archive and the new one using diffoscope: │ │ --rw-r--r-- 0 0 0 1529 2023-10-11 17:14:12.000000 bat-0.24.0/VENDOR/bincode/.cargo-checksum.json │ │ +-rw-r--r-- 0 0 0 1609 2023-10-11 17:14:12.000000 bat-0.24.0/VENDOR/bincode/.cargo-checksum.json │ │ +-rw-r--r-- 0 0 0 1766 2023-10-11 17:14:12.000000 bat-0.24.0/VENDOR/bincode/Cargo.lock │ │ -rw-r--r-- 0 0 0 1388 2023-10-11 17:14:12.000000 bat-0.24.0/VENDOR/bincode/Cargo.toml We can see that Cargo.lock has been added. To avoid hash mismatch issues and to clearly mark archives generated with the new Cargo behavior, we migrate the naming from 'cargo2.tar.gz' to 'cargo3.tar.gz'. I did not find any alternative to disable this new cargo-publish behavior, so this change is necessary to make builds reproductioble again with recent Rust versions. [1] https://github.com/rust-lang/cargo/pull/14815 https://doc.rust-lang.org/nightly/cargo/CHANGELOG.html Signed-off-by: El Mehdi YOUNES <elmehdi.younes@smile.fr> --- package/pkg-download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)