From 5895d8ac648362bc8658d1ac7433c73b1d8a1776 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Mon, 25 Dec 2023 09:47:53 +0000 Subject: [PATCH] add loong64 support for nerdctl --- 0001-add-loong64-support-for-cilium.patch | 24 +++++++++++++++++++++++ nerdctl.spec | 8 +++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-add-loong64-support-for-cilium.patch diff --git a/0001-add-loong64-support-for-cilium.patch b/0001-add-loong64-support-for-cilium.patch new file mode 100644 index 0000000..f79459b --- /dev/null +++ b/0001-add-loong64-support-for-cilium.patch @@ -0,0 +1,24 @@ +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 c4d243c..06b6cab 100644 --- a/nerdctl.spec +++ b/nerdctl.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global provider github %global provider_tld com %global project containerd @@ -15,6 +15,8 @@ License: Apache-2.0 URL: https://github.com/containerd/nerdctl Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.gz +Patch001: 0001-add-loong64-support-for-cilium.patch + BuildRequires: golang >= 1.18 Requires: containerd Requires: slirp4netns >= 0.4.0 @@ -34,6 +36,7 @@ Doc pages for %{name}. %prep %setup -qa1 +%patch001 -p1 %build CGO_ENABLED=0 @@ -60,6 +63,9 @@ install -m 0755 extras/rootless/containerd-rootless.sh %{buildroot}%{_bindir}/co %doc docs/*.md %changelog +* Mon Dec 25 2023 Wenlong Zhang - 1.2.1-2 +- add loong64 support for cilium + * Wed Apr 5 2023 yuanhui - 1.2.1-1 - Update nerdctl to 1.2.1 -- Gitee