Skip to content

Commit c0baba4

Browse files
committed
app-container/{containerd,runc}: Bump to 2.0.7 and 1.3.3
Signed-off-by: Krzesimir Nowak <[email protected]>
1 parent de01f33 commit c0baba4

File tree

3 files changed

+92
-1
lines changed

3 files changed

+92
-1
lines changed

sdk_container/src/third_party/portage-stable/app-containers/containerd/Manifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ DIST containerd-2.0.2.tar.gz 10379986 BLAKE2B aee39f749f056965b899f6525bebe00d46
22
DIST containerd-2.0.3.tar.gz 10450757 BLAKE2B 5dec56a40dc2874fb0b6fd4d72704f6417858eefd983c8ec5dfb2c9ef8be1e9e309cff83395e03c2d5fef30ed5c0561329ffbcd3dfba91e40d8017f7a605771b SHA512 9528a65d9d9f13d15d861f7ce71ab483958020bda83947d18868b477204e9e2e33eccc69280502c54b2be9ce577724e3e2b1772229c99636099b04bac1079ac1
33
DIST containerd-2.0.4.tar.gz 10450939 BLAKE2B f82ed40eab0f1d186f4fb04217b8f75a9da8e33b1140c0b5866dcc61e17fe1040f31ef09bdb07ad98a52def5e9eb12cfeb635e96b2c5f64fdb4d8cfb6c84b885 SHA512 f84e0cc0b82313df010b95989faf56e81ebfbbc321585b968c8c706917b91a9f0d895692fa5046f24f1c370de7a74b50daf83da617fe0595e5a8ff69ed658727
44
DIST containerd-2.0.5.tar.gz 10452563 BLAKE2B bf03316c9211eaa17a3b40b1fc9f9aca42fe3e621e086e612eb07c286c6b62bc7a0a2426ce7b6742dce2924d570ab599aefb43463c4fa6be277e562bad79668f SHA512 af89a5c9ad5f931c5fee33c75c13c296fc9ec966f2c64ec244897695eebb365bcb542f6b431e60d4ef7213f0ea11d3a8896d1b7f033ed445e6b521b7ddbffe6f
5+
DIST containerd-2.0.7.tar.gz 10465656 BLAKE2B 656787c91e913fee32af282bfe82dd78a2732b113ff06adb157787efd5ddca31d13e7acf26e5e59ef51d233ecdee8b89200a9a8048e8422b6d4bd272a047c1ac SHA512 393e6f6357806367b7e007da7f2a951fb4330750d4e16c8e612f49c9b5d62a9f6a2b866dc12317da11dc75f2f2cd7e2e9b5118a3f07e5a68d3475d0449844a4f
56
DIST containerd-2.1.0.tar.gz 10610618 BLAKE2B 147c21b4650543af9b0e533e381a0505ba927d6e9270b9b03a09016eb3ccf29875db7fa274944fea2ff7b029b6a05a17d14c61e24b5f3426b31f320831eeb46a SHA512 e9bb128917bb6b2e21a8e05344af3fdcdda8620be20e54407bc2c73046278a88a77bcbed6ef7a59099c9ee3303283db46b90b71afdd45236d3c534749ba844e0
67
DIST containerd-2.1.1.tar.gz 10610787 BLAKE2B acc2d769752c783643795d228c0d267b0802e09166dc783e84087da0029a822a64688f5e59c047c47b25f50ca2a1ccb7f5b6216ad6beeb4489df308e525e9716 SHA512 542f7cae61e1ef2e1b529b0bea66d7ad9016d4605de73de9c9c8a738e50ec6f470b939d1546482320515b77424bffe1cf24b721173ac0c0ecd0100c92817cfb1
78
DIST containerd-2.1.4.tar.gz 10614131 BLAKE2B b8f4007b4bb368a1fa04c913d606f65d2ea4a17a6419ce12f2b6112eee2574d7a09fb8e2500d1c2f21bef8792dc047df4d63446211ae006662e616facda91f24 SHA512 a9f84784e917621ee5ea38ad20b8106e642fbf463a00d319b73a1a8e4d1fdd5be2fba0789b6a5d31107ef239d3713eced99ce979d4b2764714271a63c0936c15
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# Copyright 2022-2025 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
inherit go-module systemd
6+
GIT_REVISION=4ac6c20c7bbf8177f29e46bbdc658fec02ffb8ad
7+
8+
DESCRIPTION="A daemon to control runC"
9+
HOMEPAGE="https://containerd.io/"
10+
SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
11+
12+
LICENSE="Apache-2.0"
13+
SLOT="0"
14+
KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
15+
IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
16+
17+
COMMON_DEPEND="
18+
btrfs? ( sys-fs/btrfs-progs )
19+
seccomp? ( sys-libs/libseccomp )
20+
"
21+
22+
DEPEND="
23+
${COMMON_DEPEND}
24+
"
25+
26+
# recommended minimum version of runc is found in script/setup/runc-version
27+
RDEPEND="
28+
${COMMON_DEPEND}
29+
>=app-containers/runc-1.3.3[apparmor?,seccomp?]
30+
"
31+
32+
BDEPEND="
33+
dev-go/go-md2man
34+
virtual/pkgconfig
35+
"
36+
37+
# tests require root or docker
38+
RESTRICT+="test"
39+
40+
src_prepare() {
41+
default
42+
sed -i \
43+
-e "s/-s -w//" \
44+
-e "s/-mod=readonly//" \
45+
Makefile || die
46+
sed -i \
47+
-e "s:/usr/local:/usr:" \
48+
containerd.service || die
49+
}
50+
51+
src_compile() {
52+
local options=(
53+
$(usev apparmor)
54+
$(usex btrfs "" "no_btrfs")
55+
$(usex cri "" "no_cri")
56+
$(usex device-mapper "" "no_devmapper")
57+
$(usev seccomp)
58+
$(usev selinux)
59+
)
60+
61+
myemakeargs=(
62+
BUILDTAGS="${options[*]}"
63+
LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
64+
REVISION="${GIT_REVISION}"
65+
VERSION=v${PV}
66+
)
67+
68+
# race condition in man target https://bugs.gentoo.org/765100
69+
# we need to explicitly specify GOFLAGS for "go run" to use vendor source
70+
emake "${myemakeargs[@]}" man -j1 #nowarn
71+
emake "${myemakeargs[@]}" all
72+
73+
}
74+
75+
src_install() {
76+
rm bin/gen-manpages || die
77+
dobin bin/*
78+
doman man/*
79+
newconfd "${FILESDIR}"/${PN}.confd "${PN}"
80+
newinitd "${FILESDIR}"/${PN}.initd "${PN}"
81+
systemd_dounit containerd.service
82+
keepdir /var/lib/containerd
83+
84+
# we already installed manpages, remove markdown source
85+
# before installing docs directory
86+
rm -r docs/man || die
87+
88+
local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
89+
einstalldocs
90+
}

sdk_container/src/third_party/portage-stable/app-containers/runc/runc-1.3.3.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
1919

2020
LICENSE="Apache-2.0 BSD-2 BSD MIT"
2121
SLOT="0"
22-
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
22+
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
2323
IUSE="apparmor hardened +kmem +seccomp selinux test"
2424

2525
COMMON_DEPEND="

0 commit comments

Comments
 (0)