diff --git a/0001-containerd-add-blot-symbol-to-support-loong64.patch b/0001-containerd-add-blot-symbol-to-support-loong64.patch deleted file mode 100644 index 5c5d5faf056d8196912c58a33cd93fb683e7d406..0000000000000000000000000000000000000000 --- a/0001-containerd-add-blot-symbol-to-support-loong64.patch +++ /dev/null @@ -1,31 +0,0 @@ -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/containerd.service b/containerd.service deleted file mode 100644 index 08c6a2e0a70e8108a96bcc557b2352bb1f3669cc..0000000000000000000000000000000000000000 --- a/containerd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=containerd container runtime -Documentation=https://containerd.io -After=network.target - -[Service] -ExecStartPre=/sbin/modprobe overlay -ExecStart=/usr/bin/containerd -Delegate=yes -KillMode=process - -[Install] -WantedBy=multi-user.target diff --git a/containerd.spec b/containerd.spec index ba40d2a958a3200e96e28e62d64980757222d0d8..9e5e5185489a87f072a54cbab8bc064fd9af8d2e 100644 --- a/containerd.spec +++ b/containerd.spec @@ -1,21 +1,22 @@ -%define anolis_release 5 +%define anolis_release 1 %bcond_without check %global goipath github.com/containerd/containerd Name: containerd -Version: 1.6.20 +Version: 1.6.28 Release: %{anolis_release}%{?dist} Summary: Open and reliable container runtime License: ASL 2.0 URL: https://github.com/containerd/containerd Source0: https://github.com/containerd/containerd/archive/refs/tags/v%{version}.tar.gz -Source1: containerd.service Source2: containerd.toml -Patch001: 0001-containerd-add-blot-symbol-to-support-loong64.patch -BuildRequires: btrfs-progs-devel systemd-rpm-macros go-md2man +BuildRequires: rpm_macro(_unitdir) +BuildRequires: btrfs-progs-devel +BuildRequires: go-md2man +BuildRequires: golist Requires: runc %gometa @@ -41,7 +42,8 @@ The %{name}-doc package contains documentation files for %{name}. %goprep -k # Used only for generation: rm -rf cmd/protoc-gen-gogoctrd -%patch001 -p1 +# Replace default bin directory +sed -i "s|/usr/local/bin/containerd|/usr/bin/containerd|" containerd.service %build export LDFLAGS="-X %{goipath}/version.Version=%{version} " @@ -56,17 +58,17 @@ go-md2man -in docs/man/containerd-config.toml.5.md -out _man/containerd-config.t rm %{gobuilddir}/bin/gen-manpages %install -mkdir -p %{buildroot}%{_bindir} +install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ -for file in containerd.8 containerd-config.8 ctr.8 containerd-config.toml.5; do - if [ $file == "containerd-config.toml.5" ]; then - install -D -p -m 0644 _man/$file %{buildroot}%{_mandir}/man5/$file - else - install -D -p -m 0644 _man/$file %{buildroot}%{_mandir}/man8/$file - fi -done -install -D -p -m 0644 %{S:1} %{buildroot}%{_unitdir}/containerd.service +install -D -p -m 0644 _man/containerd.8 %{buildroot}%{_mandir}/man8/containerd.8 +install -D -p -m 0644 _man/containerd-config.8 %{buildroot}%{_mandir}/man8/containerd-config.8 +install -D -p -m 0644 _man/ctr.8 %{buildroot}%{_mandir}/man8/ctr.8 +install -D -p -m 0644 _man/containerd-config.toml.5 %{buildroot}%{_mandir}/man5/containerd-config.toml.5 +install -D -p -m 0644 containerd.service %{buildroot}%{_unitdir}/containerd.service install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml +mkdir -p %{buildroot}%{_sharedstatedir}/containerd/opt + +%generate_compatibility_deps %post %systemd_post containerd.service @@ -79,11 +81,9 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %if %{with check} %check -%gocheck -d pkg/cri/server -t integration +%gocheck -d pkg/cri/server -t integration -d platforms %endif -%generate_compatibility_deps - %files %license LICENSE NOTICE %{_bindir}/* @@ -96,12 +96,17 @@ install -D -p -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/containerd/config.toml %{_unitdir}/containerd.service %dir %{_sysconfdir}/containerd %config(noreplace) %{_sysconfdir}/containerd/config.toml +%dir %{_sharedstatedir}/containerd +%dir %{_sharedstatedir}/containerd/opt %files doc %doc README.md RELEASES.md docs ROADMAP.md SCOPE.md %doc code-of-conduct.md BUILDING.md %changelog +* Fri Feb 02 2024 Funda Wang - 1.6.28-1 +- New version 1.6.28 + * Wed Sep 13 2023 Wenlong Zhang - 1.6.20-5 - add loong64 support for containerd diff --git a/v1.6.20.tar.gz b/v1.6.28.tar.gz similarity index 51% rename from v1.6.20.tar.gz rename to v1.6.28.tar.gz index 984389bcf845974244211d78dd4295676d051f84..7cd672064f72d4715fc1775e116bccf3ee4b5ef2 100644 Binary files a/v1.6.20.tar.gz and b/v1.6.28.tar.gz differ