diff --git a/containerd.spec b/containerd.spec index 487ac7b1eecf8d821fb7fbc20f76907eb5ec6f76..ba22d10171bba67987d1c634bc70f75f7ce227db 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.2.0 Name: containerd -Release: 308 +Release: 309 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -12,6 +12,8 @@ Source2: apply-patch Source3: series.conf Source4: git-commit Source5: gen-commit.sh +Source6: net.tar.gz +Source7: sys.tar.gz BuildRequires: golang glibc-static make btrfs-progs-devel git @@ -32,6 +34,12 @@ cp %{SOURCE4} . %build echo %{VERSION}.%{RELEASE} > containerd_version bash ./apply-patch +%ifarch loongarch64 +rm -rf vendor/golang.org/x/sys +rm -rf vendor/golang.org/x/net +tar -xf %{SOURCE6} -C vendor/golang.org/x/ +tar -xf %{SOURCE7} -C vendor/golang.org/x/ +%endif GO_BUILD_PATH=$PWD/_build install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath}) @@ -55,6 +63,9 @@ install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr %{_bindir}/ctr %changelog +* Thu Jan 5 2023 Wenlong Zhang - 1.2.0-309 +- add loongarch support for containerd + * Thu Dec 16 2022 zhongjiawei - 1.2.0-308 - Type:bugfix - ID:NA diff --git a/net.tar.gz b/net.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a7d55c8c3b4d309fb47d1e9e8ca1f809e178fa97 Binary files /dev/null and b/net.tar.gz differ diff --git a/patch/0001-containerd-add-blot-symbol-to-support-loong64.patch b/patch/0001-containerd-add-blot-symbol-to-support-loong64.patch new file mode 100644 index 0000000000000000000000000000000000000000..33b790d99a49c0011bc19f6379c238102f771d26 --- /dev/null +++ b/patch/0001-containerd-add-blot-symbol-to-support-loong64.patch @@ -0,0 +1,32 @@ +From ede7f7ed58d034507643a98aeca453dba0f497fb Mon Sep 17 00:00:00 2001 +From: build +Date: Thu, 5 Jan 2023 12:37:27 +0000 +Subject: [PATCH] containerd add blot symbol to support loong64 + +--- + vendor/go.etcd.io/bbolt/bolt_loong64.go | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + create mode 100644 vendor/go.etcd.io/bbolt/bolt_loong64.go + +diff --git a/vendor/go.etcd.io/bbolt/bolt_loong64.go b/vendor/go.etcd.io/bbolt/bolt_loong64.go +new file mode 100644 +index 0000000..bb402fb +--- /dev/null ++++ b/vendor/go.etcd.io/bbolt/bolt_loong64.go +@@ -0,0 +1,13 @@ ++// +build loong64 ++ ++package bbolt ++ ++// maxMapSize represents the largest mmap size supported by Bolt. ++const maxMapSize = 0x8000000000 // 512GB ++ ++// maxAllocSize is the size used when creating array pointers. ++const maxAllocSize = 0x7FFFFFFF ++ ++// Are unaligned load/stores broken on this arch? ++var brokenUnaligned = false ++ +-- +2.33.0 + diff --git a/series.conf b/series.conf index 48dc8138a00a43126adb94c179536b78e442d8c9..a9a9b427bf36c3807b1a5f1cfbef60d72d53108d 100644 --- a/series.conf +++ b/series.conf @@ -99,4 +99,5 @@ patch/0091-schema1-reject-ambiguous-documents.patch patch/0092-containerd-add-CGO-sercurity-build-options.patch patch/0093-containerd-fix-version-number-wrong.patch patch/0094-containerd-Fix-goroutine-leak-in-Exec.patch +patch/0001-containerd-add-blot-symbol-to-support-loong64.patch # end diff --git a/sys.tar.gz b/sys.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a9c1bcba0e8f71b858def78eeb03534dac4a53bd Binary files /dev/null and b/sys.tar.gz differ