commit: 57e57d7d51be6ae9ff8e05e54c32c2420efe65f6 Author: William Hubbs <williamh <AT> gentoo <DOT> org> AuthorDate: Sat Aug 20 22:02:44 2022 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Sat Aug 20 22:02:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e57d7d
app-containers/containerd: drop 1.5.11, 1.6.2, 1.6.4 Bug: https://bugs.gentoo.org/850124 Signed-off-by: William Hubbs <williamh <AT> gentoo.org> app-containers/containerd/Manifest | 5 -- app-containers/containerd/containerd-1.5.11.ebuild | 84 --------------------- app-containers/containerd/containerd-1.6.2.ebuild | 85 ---------------------- app-containers/containerd/containerd-1.6.4.ebuild | 85 ---------------------- 4 files changed, 259 deletions(-) diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest index 98435a5c8fd0..43c665dcbcc9 100644 --- a/app-containers/containerd/Manifest +++ b/app-containers/containerd/Manifest @@ -1,7 +1,2 @@ -DIST containerd-1.5.11.tar.gz 7494477 BLAKE2B 2415e85694e5f4410c8cee7be08d1d304adfcdb95c4078f7a92c710a5a11a29ae011daa70fcfa72c2fabf5b48b7cac962b39121f18bb027931ef77214e86b1aa SHA512 6348f4ae7f9b473aac7d5e7325ca4539345d09f01b95383cec28f09d5e5b0b831e25fe305c3a15050f1e1959948ee8dcad788a1d6dd4780cf3077132d5617ef8 -DIST containerd-1.6.2-deps.tar.xz 99095488 BLAKE2B a8ab5b2a506cb90cbadba9461d2737b1ac0bea672681e3f940d1dc76fdd2885d1ab287129a2aaa2fab64d19ba049eb7ecdffbafa6b08772430b94428a775a042 SHA512 2a96405c28a6ebaeae523ef36b4721f493332953880bfb7cecc4571b325557f2566141a62c0eb5c981045d498dd18ad18f8e7adfd9d5f17218a5d5d65760b855 -DIST containerd-1.6.2.tar.gz 8617797 BLAKE2B aaf16dbbd071f4eab45bc94cc50643b33665b5c4a4155ef007b7a974e04660235b69e12d99e78c24b27c09d45c0eb6e9be3d688b41592a54497a0a4e5f577c86 SHA512 3ff280ae0cf5a45b0c21a42290c94bad30d46bf8a5bbcef1024e3c67fde3345a31b23a88cdbb6025d526c93e2a0899e9b341c9b8ccbba381983de3d8a39b1046 -DIST containerd-1.6.4-deps.tar.xz 96520056 BLAKE2B 695e26ffc26c0d85350c91412b746f59d7edd556aef2fea71a8947b79e0cdba573503a19b45ddc4a733b721be6cef581ab22e7522d00ab9221a1322d5b9670a4 SHA512 439bad6067939ab97115c0cf85d8eafd1214435f78bc57ee6a3d60e606da1260153d871e50de7b31fb57dc293e2f1ffa083cf89d08a394ee99450effda309678 -DIST containerd-1.6.4.tar.gz 8625617 BLAKE2B b3766eec306a4e4b27849aa3131c0adf84e040c9b6b843bc2b231a13f5f1b6222035e4a7d2315170b0a001be60874544bbe2920bf4cda951aac48217efb3de28 SHA512 a913dbfdcf29faebd5617f64e7c5e62b366cb9c80d0dbf55337121601f3c5b7d19c1670f71e9454513b681a1568c7cd1fc28c5daf3ea1c820279f2a2356ff8c6 DIST containerd-1.6.8-deps.tar.xz 96625924 BLAKE2B 773b7c660826648b4077d320cbb3b265129fdd81233ac4aeb833586c9f25707c62e338492fb9905010b160e3fa635069ca4220136bca344ce54d154ee074bdeb SHA512 d805fefc0500fe2156bd8c6a752f9d13cafe85b528454ddc6efc95b09e05548df666cf9136aa3169794a0f7cc8135b943da1b106eec7e3dbbc83938892d80ead DIST containerd-1.6.8.tar.gz 8663866 BLAKE2B 4b1473febb738ce46d435a687971058f4bf586a2877b2899446a323e2e7ccf8a0ec9015277693f9b1bac6f663721117704e97031ce923ae62d27a8d7b882bdfd SHA512 c204c028cdfd76537d1da01c66526fc85b29b02d2412569bb9b265375603614b037356c61846025a72281398f0f46df326a5ea3df97f57901cce85f2f728f0ba diff --git a/app-containers/containerd/containerd-1.5.11.ebuild b/app-containers/containerd/containerd-1.5.11.ebuild deleted file mode 100644 index c848b75853ce..000000000000 --- a/app-containers/containerd/containerd-1.5.11.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GIT_REVISION=3df54a852345ae127d1fa3092b95168e4a88e2f8 -inherit go-module systemd - -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.0.3 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -src_prepare() { - default - sed -i \ - -e "s/-s -w//" \ - 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() { - dobin bin/* - doman man/* - 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 -} diff --git a/app-containers/containerd/containerd-1.6.2.ebuild b/app-containers/containerd/containerd-1.6.2.ebuild deleted file mode 100644 index eef31e9b8f79..000000000000 --- a/app-containers/containerd/containerd-1.6.2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GIT_REVISION=de8046a5501db9e0e478e1c10cbcfb21af4c6b2d -inherit go-module systemd - -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" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"; - -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.0 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -src_prepare() { - default - sed -i \ - -e "s/-s -w//" \ - 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() { - dobin bin/* - doman man/* - 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 -} diff --git a/app-containers/containerd/containerd-1.6.4.ebuild b/app-containers/containerd/containerd-1.6.4.ebuild deleted file mode 100644 index bcc9928fb160..000000000000 --- a/app-containers/containerd/containerd-1.6.4.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -GIT_REVISION=212e8b6fa2f44b9c21b2798135fc6fb7c53efc16 -inherit go-module systemd - -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" -SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"; - -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.2 -" - -BDEPEND=" - dev-go/go-md2man - virtual/pkgconfig -" - -# tests require root or docker -# upstream does not recommend stripping binary -RESTRICT+=" strip test" - -src_prepare() { - default - sed -i \ - -e "s/-s -w//" \ - 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() { - dobin bin/* - doman man/* - 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 -}
