diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..ba502f28a8ce9e6c8022f491f4ce2bdf7160c23c --- /dev/null +++ b/download @@ -0,0 +1,5 @@ +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 + 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..a66975ecd2a8d8ca7f2524aaba61593416965918 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 pkg_name image-service-%{release_version} %global __os_install_post %{nil} %global debug_package %{nil} @@ -7,18 +7,19 @@ Summary: Nydus image service Name: nydus-rs Version: %{release_version} -Release: %{anolis_release}%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://github.com/dragonflyoss/image-service 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: rust >= 1.61.0 +# BuildRequires: cargo >= 1.61.0 +# BuildRequires: rustfmt >= 1.61.0 +# BuildRequires: clippy >= 1.61.0 BuildRequires: golang >= 1.17 %description @@ -36,20 +37,33 @@ 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 +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 +# mkdir -p .cargo +# cat > .cargo/config < - 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