Accepting request 1175971 from home:cyphar:docker

- Switch back to using tar_scm service. Aside from obs_scm using more bandwidth
  and storage than a locally-compressed tar.xz, it seems there's some weird
  issue with paths in obscpio that break our SLE-12-only patch.

OBS-URL: https://build.opensuse.org/request/show/1175971
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=178
This commit is contained in:
Aleksa Sarai 2024-05-22 23:27:37 +00:00 committed by Git OBS Bridge
parent a89afd5b9c
commit b700673898
5 changed files with 371 additions and 2121 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
<services>
<service name="obs_scm" mode="manual">
<service name="tar_scm" mode="manual">
<param name="url">https://github.com/containerd/containerd.git</param>
<param name="scm">git</param>
<param name="filename">containerd</param>
@ -7,11 +7,8 @@
<param name="revision">v1.7.17</param>
<param name="exclude">.git</param>
</service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<service name="recompress" mode="manual">
<param name="file">containerd-*.tar</param>
<param name="compression">xz</param>
</service>
</services>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b376a2339a0751ec75a7e7a9f8607f563a07cb7c93c09cf9badfda5fa64600e
size 50037773

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5aaf84248bedb272f99c4da77c0acb5d39d44a61e94f4cb1c95880c68a73c396
size 5933672

View File

@ -3,9 +3,11 @@ Wed May 22 19:31:04 UTC 2024 - Aleksa Sarai <asarai@suse.com>
- Update to containerd v1.7.17. Upstream release notes:
<https://github.com/containerd/containerd/releases/tag/v1.7.17>
- Switch back to using tar_scm service. Aside from obs_scm using more bandwidth
and storage than a locally-compressed tar.xz, it seems there's some weird
issue with paths in obscpio that break our SLE-12-only patch.
- Rebase patches:
* 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch
- Update to containerd v1.7.16. Upstream release notes:
<https://github.com/containerd/containerd/releases/tag/v1.7.16>
CVE-2023-45288 bsc#1221400