public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/containerd/
Date: Tue, 16 Jul 2024 20:29:11 +0000 (UTC)	[thread overview]
Message-ID: <1721161744.5528b11020241384c0de722b553c97f24cea3790.chewi@gentoo> (raw)

commit:     5528b11020241384c0de722b553c97f24cea3790
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 20:23:28 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 20:29:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5528b110

app-containers/containerd: Version bump to 1.7.19

Tested successfully on Flatcar.

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-containers/containerd/Manifest                 |  1 +
 app-containers/containerd/containerd-1.7.19.ebuild | 86 ++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 6163749e53f0..4407a20214b3 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -1 +1,2 @@
 DIST containerd-1.7.15.tar.gz 10071827 BLAKE2B 91de9b7d777d53ecdab4af5bbb0d4ccbe755e4cf0fb7bc99a7bb15c66e0e11ad30aa2af685e0e8b0df80dbeef451704fa056a04b460d92adceebd290977febfc SHA512 84a94c7658a431cfd7a5321ac262d966f4291337ddff14211951b0d2025cd3af25a48175794d2b3a630ffc25ba03047579163546a4758a2fb5d1898cd233854f
+DIST containerd-1.7.19.tar.gz 10157428 BLAKE2B 3f51d63d4280a11ffe308c3e65df2fefdd91f543169501cf361bb8c6d5085b6b606cc3425508246ce872c86a475e2d195dd2473fee89a47548cfdfbd810307c2 SHA512 cb58bf5148381f9f0eba096e159592f294f887c5b17f8aaf6de8fed80c515abf4f08c849bbbd266dd85ede09fe709bf7d15a61a749f1136456329c47508dbe34

diff --git a/app-containers/containerd/containerd-1.7.19.ebuild b/app-containers/containerd/containerd-1.7.19.ebuild
new file mode 100644
index 000000000000..964617a43951
--- /dev/null
+++ b/app-containers/containerd/containerd-1.7.19.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_REVISION=2bf793ef6dc9a18e00cb12efb64355c2c9d5eb41
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
+
+DEPEND="
+	btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )
+"
+
+# recommended version of runc is found in script/setup/runc-version
+RDEPEND="
+	${DEPEND}
+	~app-containers/runc-1.1.13[apparmor?,seccomp?]
+"
+
+BDEPEND="
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+
+# tests require root or docker
+RESTRICT+="test"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s/-s -w//" \
+		-e "s/-mod=readonly//" \
+		Makefile || die
+	sed -i \
+		-e "s:/usr/local:/usr:" \
+		containerd.service || die
+}
+
+src_compile() {
+	local options=(
+		$(usev apparmor)
+		$(usex btrfs "" "no_btrfs")
+		$(usex cri "" "no_cri")
+		$(usex device-mapper "" "no_devmapper")
+		$(usev seccomp)
+		$(usev selinux)
+	)
+
+	myemakeargs=(
+		BUILDTAGS="${options[*]}"
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')"
+		REVISION="${GIT_REVISION}"
+		VERSION=v${PV}
+	)
+
+	# race condition in man target https://bugs.gentoo.org/765100
+	# we need to explicitly specify GOFLAGS for "go run" to use vendor source
+	emake "${myemakeargs[@]}" man -j1 #nowarn
+	emake "${myemakeargs[@]}" all
+
+}
+
+src_install() {
+	rm "${D}"/bin/gen-manpages
+	dobin bin/*
+	doman man/*
+	newconfd "${FILESDIR}"/${PN}.confd "${PN}"
+	newinitd "${FILESDIR}"/${PN}.initd "${PN}"
+	systemd_dounit containerd.service
+	keepdir /var/lib/containerd
+
+	# we already installed manpages, remove markdown source
+	# before installing docs directory
+	rm -r docs/man || die
+
+	local DOCS=( ADOPTERS.md README.md RELEASES.md ROADMAP.md SCOPE.md docs/. )
+	einstalldocs
+}


             reply	other threads:[~2024-07-16 20:29 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-16 20:29 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-15 14:08 [gentoo-commits] repo/gentoo:master commit in: app-containers/containerd/ William Hubbs
2025-01-14 23:37 William Hubbs
2025-01-10 16:54 Arthur Zamarin
2025-01-10 14:57 Sam James
2025-01-10 14:57 Sam James
2024-12-20  4:17 William Hubbs
2024-12-11 13:51 William Hubbs
2024-12-10 15:15 William Hubbs
2024-12-09 23:36 William Hubbs
2024-10-29 16:06 William Hubbs
2024-09-24 22:07 James Le Cuirot
2024-09-24 22:07 James Le Cuirot
2024-08-27 19:09 William Hubbs
2024-06-18 22:40 William Hubbs
2024-06-13 17:57 Sam James
2024-06-13  2:15 Sam James
2024-06-13  1:56 Sam James
2024-04-26  5:08 William Hubbs
2024-03-17 14:56 William Hubbs
2024-02-01 16:24 William Hubbs
2023-11-09 22:54 William Hubbs
2023-09-25 19:20 William Hubbs
2023-07-25 15:59 William Hubbs
2023-07-25 15:20 William Hubbs
2023-07-24 21:26 William Hubbs
2023-07-24 20:54 Sam James
2023-07-21 23:52 Sam James
2023-07-21 21:52 Sam James
2023-07-21  5:17 William Hubbs
2023-07-20 19:33 William Hubbs
2023-04-23 21:34 William Hubbs
2023-04-14 15:23 William Hubbs
2023-04-13  0:55 Sam James
2023-04-13  0:55 Sam James
2023-04-13  0:55 Sam James
2023-04-07 17:48 William Hubbs
2023-01-05  5:39 William Hubbs
2023-01-05  5:05 Sam James
2023-01-03 19:34 William Hubbs
2023-01-03 19:16 Arthur Zamarin
2023-01-02 22:22 William Hubbs
2022-08-20 22:09 William Hubbs
2022-08-19 19:33 Arthur Zamarin
2022-08-15  7:42 Agostino Sarubbo
2022-08-15  7:40 Agostino Sarubbo
2022-08-14 22:46 William Hubbs
2022-05-17 14:52 William Hubbs
2022-04-14 22:40 William Hubbs
2022-04-09 19:46 Arthur Zamarin
2022-04-06  6:32 Agostino Sarubbo
2022-04-05  2:37 Sam James
2022-04-04 19:39 William Hubbs
2022-04-04 15:28 William Hubbs
2022-03-28  5:35 William Hubbs
2022-03-28  5:35 William Hubbs
2022-03-28  5:35 William Hubbs
2022-03-25 19:24 Sam James
2022-02-14  9:48 Jakov Smolić
2022-01-07 18:06 Georgy Yakovlev
2022-01-07 17:55 Georgy Yakovlev
2022-01-06  8:17 Georgy Yakovlev
2022-01-06  8:17 Georgy Yakovlev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1721161744.5528b11020241384c0de722b553c97f24cea3790.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox