diff --git a/download b/download index 05b1190b57e0c8e0b11c1041fb294b448afcd12c..72e969e97a3de0fc70329ae441c1b3c12c02cb18 100644 --- a/download +++ b/download @@ -1,4 +1,4 @@ -5357360e893e450013edd0d2286208b7 rust-1.61.0.tar.gz -f813ef8827a4c20bc1d7bc519a742449 image-service-2.1.1-go-vendor.tar.gz -989dfb1c877e823ea36b1c0f70d8d03b image-service-2.1.1-vendor.tar.gz -acc94526c0d431fd51c0137233e689eb image-service-2.1.1.tar.gz +5357360e893e450013edd0d2286208b7 rust-1.61.0.tar.gz +e2d3f5645c38420b2fdbe7febdbf3aa8 image-service-2.1.4-go-vendor.tar.gz +888253dc60580df9c64a0e9712b7c829 image-service-2.1.4-vendor.tar.gz +ff34ae54af9f8aea8e64339aedc46d97 image-service-2.1.4.tar.gz \ No newline at end of file diff --git a/nydus-rs.spec b/nydus-rs.spec index 0916912e0e46e1b73dba97a4cf1b8db426754510..2e12e334cb77bdad01017c7b9f83b4188af409af 100644 --- a/nydus-rs.spec +++ b/nydus-rs.spec @@ -1,5 +1,5 @@ -%define anolis_release .0.1 -%define release_version 2.1.1 +%define anolis_release 1 +%define release_version 2.1.4 %define pkg_name image-service-%{release_version} %global __os_install_post %{nil} %global debug_package %{nil} @@ -7,7 +7,7 @@ Summary: Nydus image service Name: nydus-rs Version: %{release_version} -Release: 1%{anolis_release}%{?dist} +Release: %{anolis_release}%{?dist} URL: https://github.com/dragonflyoss/image-service License: Apache-2.0 Source0: %{pkg_name}.tar.gz @@ -16,11 +16,11 @@ Source2: %{pkg_name}-go-vendor.tar.gz Source3: rust-1.61.0.tar.gz BuildRequires: make -# BuildRequires: rust >= 1.61.0 -# BuildRequires: cargo >= 1.61.0 -# BuildRequires: rustfmt >= 1.61.0 -# BuildRequires: clippy >= 1.61.0 -BuildRequires: golang >= 1.17 +# BuildRequires: rust == 1.61.0 +# BuildRequires: cargo == 1.61.0 +# BuildRequires: rustfmt == 1.61.0 +# BuildRequires: clippy == 1.61.0 +BuildRequires: golang >= 1.18 %description Nydus - the Dragonfly image service, providing fast, secure and easy access to container images. @@ -37,7 +37,20 @@ tar -zxf ./%{pkg_name}-go-vendor/docker-nydus-graphdriver-vendor.tar.gz -C ./con tar -zxf ./%{pkg_name}-go-vendor/nydusify-vendor.tar.gz -C ./contrib/nydusify tar -zxf ./%{pkg_name}-go-vendor/nydus-overlayfs-vendor.tar.gz -C ./contrib/nydus-overlayfs go env -w GOFLAGS="-mod=vendor" + +tar xof %{SOURCE1} +mkdir -p ./.cargo +cat >> ./.cargo/config << EOF +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "./vendor" +EOF + sed -i '/work_dir/c\ \"work_dir\" : \"/var/cache/nydus-rs/\"' ./misc/configs/nydusd-config.json +sed -i '/clippy/d' ./Makefile + cd .. mkdir rust-1.61.0 cd rust-1.61.0 @@ -49,15 +62,6 @@ cp -r rust-aarch64/* %{_buildrootdir}/cargo %ifarch x86_64 cp -r rust-x86_64/* %{_buildrootdir}/cargo %endif -# mkdir -p .cargo -# cat > .cargo/config < - 2.1.4-1 +- Update Nydus image service to 2.1.4 * Wed Mar 01 2023 hanshuang - 2.1.1-1.0.1 - fix a7 compile problem - * Mon Dec 26 2022 Qinqi Qu - 2.1.1-1 - Update Nydus image service to 2.1.1 * Thu Sep 8 2022 Qinqi Qu - 2.1.0-rc.2-1