diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..72e969e97a3de0fc70329ae441c1b3c12c02cb18 --- /dev/null +++ b/download @@ -0,0 +1,4 @@ +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/image-service-2.1.1-go-vendor.tar.gz b/image-service-2.1.1-go-vendor.tar.gz deleted file mode 100644 index bbcb70c551b6e7f912aa0ff2695a05339a7fcb85..0000000000000000000000000000000000000000 Binary files a/image-service-2.1.1-go-vendor.tar.gz and /dev/null differ diff --git a/image-service-2.1.1-vendor.tar.gz b/image-service-2.1.1-vendor.tar.gz deleted file mode 100644 index a615124b64595dce48d5146c8fcb1543bf267560..0000000000000000000000000000000000000000 Binary files a/image-service-2.1.1-vendor.tar.gz and /dev/null differ diff --git a/image-service-2.1.1.tar.gz b/image-service-2.1.1.tar.gz deleted file mode 100644 index 0c8e99bf0c5e73573d7cada2b7880e977d8e36a1..0000000000000000000000000000000000000000 Binary files a/image-service-2.1.1.tar.gz and /dev/null differ diff --git a/nydus-rs.spec b/nydus-rs.spec index eee11c512343797cc667bff39cc9820fdd173704..d295bbe58e7b1f386d429a543c133e30042cca80 100644 --- a/nydus-rs.spec +++ b/nydus-rs.spec @@ -1,5 +1,5 @@ -%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} @@ -13,13 +13,17 @@ License: Apache-2.0 Source0: %{pkg_name}.tar.gz Source1: %{pkg_name}-vendor.tar.gz 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 +BuildRequires: openssl-devel +BuildRequires: perl +BuildRequires: git %description Nydus - the Dragonfly image service, providing fast, secure and easy access to container images. @@ -38,8 +42,8 @@ tar -zxf ./%{pkg_name}-go-vendor/nydus-overlayfs-vendor.tar.gz -C ./contrib/nydu go env -w GOFLAGS="-mod=vendor" tar xof %{SOURCE1} -mkdir -p .cargo -cat >> .cargo/config << EOF +mkdir -p ./.cargo +cat >> ./.cargo/config << EOF [source.crates-io] replace-with = "vendored-sources" @@ -48,8 +52,25 @@ 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 +%{__tar} xf %{SOURCE3} +mkdir -p %{_buildrootdir}/cargo +%ifarch aarch64 +cp -r rust-aarch64/* %{_buildrootdir}/cargo +%endif +%ifarch x86_64 +cp -r rust-x86_64/* %{_buildrootdir}/cargo +%endif %build +export CARGO_HOME=%{_buildrootdir}/cargo +export PATH=%{_buildrootdir}/cargo/bin:$PATH +export LD_LIBRARY_PATH=%{_buildrootdir}/cargo/lib:$LD_LIBRARY_PATH +rustc --version make -C contrib/nydusify make -C contrib/ctr-remote make -C contrib/nydus-overlayfs @@ -88,6 +109,10 @@ mkdir -p %{buildroot}/var/cache/nydus-rs/ %postun %changelog +* Fri Mar 03 2023 Qinqi Qu - 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