diff --git a/download b/download index 72e969e97a3de0fc70329ae441c1b3c12c02cb18..d4fe294ca3a1f8d1cd0f614055d3100c07b30661 100644 --- a/download +++ b/download @@ -1,4 +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 +15524bab4091996d0084173f0d7da463 nydus-2.2.4-git-vendor.tar.gz +96d927433a09e40e95678143b1dec05b nydus-2.2.4-go-vendor.tar.gz +163dfb9ae1bc91717f2e9672cd25cbad v2.2.4.tar.gz +0875b666c423845a37a4909d0c949b3b nydus-2.2.4-vendor.tar.gz \ No newline at end of file diff --git a/nydus-rs.spec b/nydus-rs.spec index 8567da6f98a1c67fde9dc036b660993032426010..cebe0248e77b3e88a03d5b494d443e2f234ea769 100644 --- a/nydus-rs.spec +++ b/nydus-rs.spec @@ -1,44 +1,46 @@ -%define anolis_release 2 -%define release_version 2.1.4 -%define pkg_name image-service-%{release_version} +%define anolis_release 1 +%define release_version 2.2.4 +%define pkg_name nydus-%{release_version} %global __os_install_post %{nil} %global debug_package %{nil} -Summary: Nydus image service -Name: nydus-rs -Version: %{release_version} -Release: %{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 +Summary: Nydus image service +Name: nydus-rs +Version: %{release_version} +Release: %{anolis_release}%{?dist} +URL: https://github.com/dragonflyoss/nydus +License: Apache-2.0 +Source0: https://github.com/dragonflyoss/nydus/archive/refs/tags/v%{release_version}.tar.gz +Source1: %{pkg_name}-vendor.tar.gz +Source2: %{pkg_name}-go-vendor.tar.gz +Source3: %{pkg_name}-git-vendor.tar.gz + +ExcludeArch: loongarch64 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.18 +BuildRequires: rust >= 1.66.1 +BuildRequires: cargo >= 1.66.1 +BuildRequires: rustfmt >= 1.66.1 +BuildRequires: clippy >= 1.66.1 +BuildRequires: golang >= 1.19 BuildRequires: openssl-devel BuildRequires: perl BuildRequires: perl-core BuildRequires: perl-FindBin BuildRequires: git +BuildRequires: cmake %description Nydus - the Dragonfly image service, providing fast, secure and easy access to container images. %prep -%autosetup -n image-service-%{release_version} +%autosetup -n nydus-%{release_version} -a 3 + tar -xzf %{SOURCE2} mkdir -p ./contrib/ctr-remote/vendor -mkdir -p ./contrib/docker-nydus-graphdriver/vendor mkdir -p ./contrib/nydusify/vendor mkdir -p ./contrib/nydus-overlayfs/vendor tar -zxf ./%{pkg_name}-go-vendor/ctr-remote-vendor.tar.gz -C ./contrib/ctr-remote -tar -zxf ./%{pkg_name}-go-vendor/docker-nydus-graphdriver-vendor.tar.gz -C ./contrib/docker-nydus-graphdriver 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" @@ -56,31 +58,11 @@ EOF sed -i '/work_dir/c\ \"work_dir\" : \"/var/cache/nydus-rs/\"' ./misc/configs/nydusd-config.json sed -i '/clippy/d' ./Makefile -# Fix https://github.com/dragonflyoss/image-service/pull/1256 -sed -i 's/amd64/$(shell go env GOARCH)/g' ./contrib/ctr-remote/Makefile -sed -i 's/amd64/$(shell go env GOARCH)/g' ./contrib/nydus-overlayfs/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 -make -C contrib/docker-nydus-graphdriver %make_build release %install @@ -88,7 +70,6 @@ install -p -D -m 0755 ./target/release/nydusctl %{buildroot}%{_bindir}/nydusctl install -p -D -m 0755 ./target/release/nydusd %{buildroot}%{_bindir}/nydusd install -p -D -m 0755 ./target/release/nydus-image %{buildroot}%{_bindir}/nydus-image install -p -D -m 0755 ./contrib/ctr-remote/bin/ctr-remote %{buildroot}%{_bindir}/ctr-remote -install -p -D -m 0755 ./contrib/docker-nydus-graphdriver/bin/nydus_graphdriver %{buildroot}%{_bindir}/nydus_graphdriver install -p -D -m 0755 ./contrib/nydusify/cmd/nydusify %{buildroot}%{_bindir}/nydusify install -p -D -m 0755 ./contrib/nydus-overlayfs/bin/nydus-overlayfs %{buildroot}%{_bindir}/nydus-overlayfs install -p -D -m 0644 ./misc/configs/nydusd-config.json %{buildroot}%{_sysconfdir}/nydus/config.json @@ -100,7 +81,6 @@ mkdir -p %{buildroot}/var/cache/nydus-rs/ %{_bindir}/nydusd %{_bindir}/nydus-image %{_bindir}/ctr-remote -%{_bindir}/nydus_graphdriver %{_bindir}/nydusify %{_bindir}/nydus-overlayfs %{_sysconfdir}/nydus/config.json @@ -115,6 +95,8 @@ mkdir -p %{buildroot}/var/cache/nydus-rs/ %postun %changelog +* 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 - Support nydus-overlayfs and ctr-remote on different platforms * Fri Mar 03 2023 Qinqi Qu - 2.1.4-1 @@ -132,4 +114,4 @@ mkdir -p %{buildroot}/var/cache/nydus-rs/ * Thu Jul 14 2022 Huang Jianan - 2.0.1-1 - Update Nydus image service to 2.0.1 * Wed Mar 09 2022 Gao Xiang - 1.1.2-1 -- Initial package. +- Initial package. \ No newline at end of file