diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..67d4b95832be12d86619cd6f2d713a30f9497c58 --- /dev/null +++ b/download @@ -0,0 +1,3 @@ +5224026ed8073c1ea3bd2133aead032d v0.13.4-git-vendor.tar.gz +4fd7b95fb55ea26235e0defa30be0276 v0.13.4.tar.gz +64f3a1f6828e1533a7d525e98bec11b0 v0.13.4-vendor.tar.gz \ No newline at end of file diff --git a/nydus-snapshotter.fusedev.service b/nydus-snapshotter.fusedev.service index e0ff62d11141035d7bebeba9ac7c46e05b621520..6c37d3119dd4df23d5b59b1f0571b4d50d3c1744 100644 --- a/nydus-snapshotter.fusedev.service +++ b/nydus-snapshotter.fusedev.service @@ -6,7 +6,7 @@ Before=containerd.service [Service] Type=simple Environment=HOME=/root -ExecStart=/usr/bin/containerd-nydus-grpc --config-path /etc/nydus/nydusd-config.fusedev.json +ExecStart=/usr/bin/containerd-nydus-grpc --config /etc/nydus/config.toml Restart=always RestartSec=1 KillMode=process diff --git a/nydus-snapshotter.spec b/nydus-snapshotter.spec index e297fce07746accb4101f8e312753603e3de7635..f699bbd0f215647c27bc7e271f18a2c7e4b07dcf 100644 --- a/nydus-snapshotter.spec +++ b/nydus-snapshotter.spec @@ -1,5 +1,5 @@ -%define anolis_release 2 -%define release_version 0.5.1 +%define anolis_release 1 +%define release_version 0.13.4 %global debug_package %{nil} Name: nydus-snapshotter @@ -13,27 +13,32 @@ Source0: https://github.com/containerd/nydus-snapshotter/archive/refs/tag Source1: nydus-snapshotter.fusedev.service Source2: v%{release_version}-vendor.tar.gz Source3: 0001-containerd-add-blot-symbol-to-support-loong64.patch +Source4: v%{release_version}-git-vendor.tar.gz -Requires: nydus-rs >= 2.1.1 -BuildRequires: golang >= 1.18 +ExcludeArch: loongarch64 + +Requires: nydus-rs >= 2.2.4 +BuildRequires: golang >= 1.19 BuildRequires: git %description Nydus Snapshotter - A containerd snapshotter with data deduplication and lazy loading %prep -%autosetup -n %{name}-%{release_version} +%autosetup -n %{name}-%{release_version} -a4 +go env -w GOFLAGS="-mod=vendor" %build tar -xzf %{SOURCE2} -patch -p1 < %{SOURCE3} %make_build %install +sed -i 's/\/usr\/local\/bin\//\/usr\/bin\//g' ./misc/snapshotter/config.toml install -Dpm 0755 ./bin/containerd-nydus-grpc %{buildroot}%{_bindir}/containerd-nydus-grpc install -Dpm 0755 %{SOURCE1} %{buildroot}/etc/systemd/system/nydus-snapshotter.service install -Dpm 0755 ./misc/snapshotter/nydusd-config.fusedev.json %{buildroot}/etc/nydus/nydusd-config.fusedev.json +install -Dpm 0755 ./misc/snapshotter/config.toml %{buildroot}/etc/nydus/config.toml mkdir -p %{buildroot}/var/lib/containerd/io.containerd.snapshotter.v1.nydus/cache %check @@ -46,13 +51,15 @@ mkdir -p %{buildroot}/var/lib/containerd/io.containerd.snapshotter.v1.nydus/cach %{_bindir}/containerd-nydus-grpc /etc/systemd/system/nydus-snapshotter.service /etc/nydus/nydusd-config.fusedev.json +/etc/nydus/config.toml /var/lib/containerd/io.containerd.snapshotter.v1.nydus/cache %changelog +* Wed Dec 27 2023 Qinqi Qu - 0.13.4-1 +- Update nydus-snapshotter to 0.13.4 * Mon Nov 20 2023 Wenlong Zhang - 0.5.1-2 -- fix build error for loongarch64 - +- fix build error for loongarch64 * Mon Feb 20 2023 Qinqi Qu - 0.5.1-1 - Update nydus-snapshotter to 0.5.1 * Mon Dec 26 2022 Qinqi Qu - 0.3.3-1 diff --git a/v0.5.1-vendor.tar.gz b/v0.5.1-vendor.tar.gz deleted file mode 100644 index 3138d76da38fb75702d18d3e5cfd007e6b7dd59c..0000000000000000000000000000000000000000 Binary files a/v0.5.1-vendor.tar.gz and /dev/null differ diff --git a/v0.5.1.tar.gz b/v0.5.1.tar.gz deleted file mode 100644 index c2d524393c4abdd41b079766fb55efd19cefc817..0000000000000000000000000000000000000000 Binary files a/v0.5.1.tar.gz and /dev/null differ