diff --git a/0001-add-loong64-support-for-cilium.patch b/0001-add-loong64-support-for-cilium.patch deleted file mode 100644 index f79459b2eac14c548dda6f76da53ff52c981661c..0000000000000000000000000000000000000000 --- a/0001-add-loong64-support-for-cilium.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f31935ff063dd1f0e50fafd2344047b1f72361ce Mon Sep 17 00:00:00 2001 -From: Wenlong Zhang -Date: Mon, 25 Dec 2023 09:42:26 +0000 -Subject: [PATCH] add loong64 support for cilium - ---- - vendor/github.com/cilium/ebpf/internal/endian_le.go | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/vendor/github.com/cilium/ebpf/internal/endian_le.go b/vendor/github.com/cilium/ebpf/internal/endian_le.go -index 41a6822..62480fb 100644 ---- a/vendor/github.com/cilium/ebpf/internal/endian_le.go -+++ b/vendor/github.com/cilium/ebpf/internal/endian_le.go -@@ -1,5 +1,5 @@ --//go:build 386 || amd64 || amd64p32 || arm || arm64 || mipsle || mips64le || mips64p32le || ppc64le || riscv64 --// +build 386 amd64 amd64p32 arm arm64 mipsle mips64le mips64p32le ppc64le riscv64 -+//go:build 386 || amd64 || amd64p32 || arm || arm64 || mipsle || mips64le || mips64p32le || ppc64le || riscv64 || loong64 -+// +build 386 amd64 amd64p32 arm arm64 mipsle mips64le mips64p32le ppc64le riscv64 loong64 - - package internal - --- -2.41.0 - diff --git a/nerdctl.spec b/nerdctl.spec index df6674b4895326833f5245edef17eaeb2f277a78..93f71b8029a1977d9a5d45736c5cc2e985ca8ef8 100644 --- a/nerdctl.spec +++ b/nerdctl.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 1 %global provider github %global provider_tld com %global project containerd @@ -8,16 +8,16 @@ %global debug_package %{nil} Name: nerdctl -Version: 1.7.2 +Version: 2.1.2 Release: %{anolis_release}%{?dist} Summary: Docker-compatible CLI for containerd License: Apache-2.0 URL: https://github.com/containerd/nerdctl Source0: https://github.com/containerd/%{name}/archive/refs/tags/v%{version}.tar.gz Source1: vendor.tar.gz -Patch001: 0001-add-loong64-support-for-cilium.patch -BuildRequires: golang >= 1.20 + +BuildRequires: golang >= 1.23 Requires: containerd Requires: slirp4netns >= 0.4.0 Requires: containernetworking-plugins @@ -36,11 +36,11 @@ Doc pages for %{name}. %prep %setup -qa1 -%patch001 -p1 + %build CGO_ENABLED=0 -go build -mod=vendor -ldflags "-X 'github.com/containerd/nerdctl/pkg/version.Version=v%{version}'" -buildmode=pie -o _output/nerdctl %{provider_prefix}/cmd/nerdctl +go build -mod=vendor -ldflags "-X 'github.com/containerd/nerdctl/pkg/version.Version=v%{version}'" -buildmode=pie -o _output/nerdctl ./cmd/nerdctl %install mkdir -p %{buildroot}%{_bindir}/ @@ -63,6 +63,9 @@ install -m 0755 extras/rootless/containerd-rootless.sh %{buildroot}%{_bindir}/co %doc docs/*.md %changelog +* Thu Jul 21 2025 Wenlong Zhang - 2.1.2 +- Update nerdctl to 2.1.2 + * Thu Jan 4 2024 Wenlong Zhang - 1.7.2-2 - add loong64 support for nerdctl diff --git a/v1.7.2.tar.gz b/v1.7.2.tar.gz deleted file mode 100644 index 83a9c9d9a746c0158abe73511d23863f90159ea8..0000000000000000000000000000000000000000 Binary files a/v1.7.2.tar.gz and /dev/null differ diff --git a/v2.1.2.tar.gz b/v2.1.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..fd29735210c721d9e430dd2e1761eadb2af09e80 Binary files /dev/null and b/v2.1.2.tar.gz differ diff --git a/vendor.tar.gz b/vendor.tar.gz index a117faec1f6ec3a27e26af250726b38b236a2b46..2a16ec8e919fb5cc28f83bd5b8e4739a756146c4 100644 Binary files a/vendor.tar.gz and b/vendor.tar.gz differ