diff --git a/1000-Fix-build-problem-for-rust-1.84-1.patch b/1000-Fix-build-problem-for-rust-1.84-1.patch new file mode 100644 index 0000000000000000000000000000000000000000..77291e448f532d7a447b24e19c4ff104220cebb1 --- /dev/null +++ b/1000-Fix-build-problem-for-rust-1.84-1.patch @@ -0,0 +1,73 @@ +From 425040aa89fc7108855f86696eafef8826834759 Mon Sep 17 00:00:00 2001 +From: Weisson +Date: Fri, 6 Jun 2025 04:26:56 -0400 +Subject: [PATCH] Fix build problem for rust-1.84-1. + +Signed-off-by: Weisson +--- + src/bin/nydus-image/core/chunk_dict.rs | 1 + + src/bin/nydus-image/core/node.rs | 1 + + src/bin/nydus-image/main.rs | 1 + + src/bin/nydus-image/merge.rs | 3 +-- + 4 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/bin/nydus-image/core/chunk_dict.rs b/src/bin/nydus-image/core/chunk_dict.rs +index 5ae3fb3d..bbffd06a 100644 +--- a/src/bin/nydus-image/core/chunk_dict.rs ++++ b/src/bin/nydus-image/core/chunk_dict.rs +@@ -1,6 +1,7 @@ + // Copyright 2020 Ant Group. All rights reserved. + // + // SPDX-License-Identifier: Apache-2.0 ++#![allow(dead_code)] + + use std::collections::{BTreeMap, HashMap}; + use std::mem::size_of; +diff --git a/src/bin/nydus-image/core/node.rs b/src/bin/nydus-image/core/node.rs +index 3394d895..6faae85e 100644 +--- a/src/bin/nydus-image/core/node.rs ++++ b/src/bin/nydus-image/core/node.rs +@@ -2,6 +2,7 @@ + // Copyright (C) 2021 Alibaba Cloud. All rights reserved. + // + // SPDX-License-Identifier: Apache-2.0 ++#![allow(dead_code)] + + use std::collections::BTreeMap; + use std::ffi::{OsStr, OsString}; +diff --git a/src/bin/nydus-image/main.rs b/src/bin/nydus-image/main.rs +index 70aa84e5..b880976c 100644 +--- a/src/bin/nydus-image/main.rs ++++ b/src/bin/nydus-image/main.rs +@@ -2,6 +2,7 @@ + // + // SPDX-License-Identifier: Apache-2.0 + ++#![allow(dead_code)] + #![deny(warnings)] + #[macro_use(crate_authors)] + extern crate clap; +diff --git a/src/bin/nydus-image/merge.rs b/src/bin/nydus-image/merge.rs +index 6e4be8f1..0f10371b 100644 +--- a/src/bin/nydus-image/merge.rs ++++ b/src/bin/nydus-image/merge.rs +@@ -5,7 +5,6 @@ + use std::collections::HashMap; + use std::collections::HashSet; + use std::convert::TryFrom; +-use std::ops::Deref; + use std::path::{Path, PathBuf}; + use std::sync::Arc; + +@@ -262,7 +261,7 @@ impl Merger { + None, + &mut |inode: &dyn RafsInodeExt, path: &Path| -> Result<()> { + let mut node = +- MetadataTreeBuilder::parse_node(&rs, inode.deref(), path.to_path_buf()) ++ MetadataTreeBuilder::parse_node(&rs, inode, path.to_path_buf()) + .context(format!( + "parse node from bootstrap {:?}", + bootstrap_path +-- +2.47.1 + diff --git a/nydus-rs.spec b/nydus-rs.spec index cebe0248e77b3e88a03d5b494d443e2f234ea769..9d811cc93162049747834e406cab349092a42d2f 100644 --- a/nydus-rs.spec +++ b/nydus-rs.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define release_version 2.2.4 %define pkg_name nydus-%{release_version} %global __os_install_post %{nil} @@ -15,6 +15,8 @@ Source1: %{pkg_name}-vendor.tar.gz Source2: %{pkg_name}-go-vendor.tar.gz Source3: %{pkg_name}-git-vendor.tar.gz +Patch1000: 1000-Fix-build-problem-for-rust-1.84-1.patch + ExcludeArch: loongarch64 BuildRequires: make @@ -34,7 +36,7 @@ BuildRequires: cmake Nydus - the Dragonfly image service, providing fast, secure and easy access to container images. %prep -%autosetup -n nydus-%{release_version} -a 3 +%setup -n nydus-%{release_version} -a 3 tar -xzf %{SOURCE2} mkdir -p ./contrib/ctr-remote/vendor @@ -58,6 +60,8 @@ EOF sed -i '/work_dir/c\ \"work_dir\" : \"/var/cache/nydus-rs/\"' ./misc/configs/nydusd-config.json sed -i '/clippy/d' ./Makefile +%patch -P 1000 -p 1 + %build rustc --version make -C contrib/nydusify @@ -95,6 +99,9 @@ mkdir -p %{buildroot}/var/cache/nydus-rs/ %postun %changelog +* Fri Jun 6 2025 Weisson - 2.2.4-2 +- Fix rust-1.84-1 build problem. + * Wed Dec 27 2023 Qinqi Qu - 2.2.4-1 - Update Nydus image service to 2.2.4 * Fri Apr 28 2023 Qinqi Qu - 2.1.4-2