diff --git a/containerd.spec b/containerd.spec index afd5548b1fc76377aa379e101cf62cab9607564a..2520c03f68fba94264120062671b4f5234783acb 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.2.0 Name: containerd -Release: 309 +Release: 310 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -12,6 +12,10 @@ Source2: apply-patch Source3: series.conf Source4: git-commit Source5: gen-commit.sh +%ifarch loongarch64 +Source6: golang-net-loong64.tar.gz +Source7: golang-sys-loong64.tar.gz +%endif BuildRequires: golang glibc-static make btrfs-progs-devel git @@ -32,6 +36,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 +65,12 @@ install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr %{_bindir}/ctr %changelog +* Thu Mar 16 2023 zhaozhen - 1.2.0-310 +- Type:feature +- CVE:NA +- SUG:NA +- DESC:add loongarch64 support for containerd + * Mon Feb 27 2023 zhongjiawei - 1.2.0-309 - Type:CVE - ID:NA diff --git a/golang-net-loong64.tar.gz b/golang-net-loong64.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a7d55c8c3b4d309fb47d1e9e8ca1f809e178fa97 Binary files /dev/null and b/golang-net-loong64.tar.gz differ diff --git a/golang-sys-loong64.tar.gz b/golang-sys-loong64.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a9c1bcba0e8f71b858def78eeb03534dac4a53bd Binary files /dev/null and b/golang-sys-loong64.tar.gz differ diff --git a/patch/0097-containerd-add-blot-symbol-to-support-loong64.patch b/patch/0097-containerd-add-blot-symbol-to-support-loong64.patch new file mode 100644 index 0000000000000000000000000000000000000000..11f6a3513c0e52b1406d54fab13a6d60c03ea1bc --- /dev/null +++ b/patch/0097-containerd-add-blot-symbol-to-support-loong64.patch @@ -0,0 +1,32 @@ +From ede7f7ed58d034507643a98aeca453dba0f497fb Mon Sep 17 00:00:00 2001 +From: zhaozhen +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 b0352eaadfa9482ccc8bbf1668c29c92be4403fd..050923d043812815a2e47cc966a2132f2e407540 100644 --- a/series.conf +++ b/series.conf @@ -101,4 +101,5 @@ patch/0093-containerd-fix-version-number-wrong.patch patch/0094-containerd-Fix-goroutine-leak-in-Exec.patch patch/0095-oci-fix-additional-GIDs.patch patch/0096-importer-stream-oci-layout-and-manifest.json.patch +patch/0097-containerd-add-blot-symbol-to-support-loong64.patch # end