commit: 06a683c3b4dc76f409893cff9d1914703497453e Author: Robert Günzler <r <AT> gnzler <DOT> io> AuthorDate: Tue Feb 8 16:08:04 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 18 02:59:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a683c3
app-containers/crun: drop 0.19.1-r1 and patch Signed-off-by: Robert Günzler <r <AT> gnzler.io> Closes: https://github.com/gentoo/gentoo/pull/24129 Signed-off-by: Sam James <sam <AT> gentoo.org> app-containers/crun/Manifest | 1 - app-containers/crun/crun-0.19.1-r1.ebuild | 70 ------------------------- app-containers/crun/files/libcrun-linkage.patch | 29 ---------- 3 files changed, 100 deletions(-) diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest index 0c2142fa728b..fb7a97bb51ed 100644 --- a/app-containers/crun/Manifest +++ b/app-containers/crun/Manifest @@ -1,4 +1,3 @@ -DIST crun-0.19.1.tar.gz 1870594 BLAKE2B 1780a2936ff39ec80836c4c9ae072e2fc30703a31a79786337290c62dd433b5a35dcfa953be370703d1baab3de93fdb376c99ab76dff1470883c61726c313144 SHA512 f93f79d1d63d6749bcf92d48542d9555f3ad47657c959c7c06701861d7a5a4171969f00f6dff3878286970a48aba3314c25e35c005463e606533b0ff7843d994 DIST crun-1.2.tar.gz 1879836 BLAKE2B 45370e3206a13c963d694f338dc0a00de24253025d31ec893353905235b239b8e7f626ddd4ee0cc32da2b3f5676b42f59f3214a1eb9c3af4612483cd6fd14693 SHA512 5cadaf0eb0e9bcf53726e7f6ffb664c8327f0f4e7cdbf75ae8a0cd4759f7c8a8a2611df65ca1436a50d7af5d37505aac861d7db4d46a93c3832362228cb37cbc DIST crun-1.3.tar.gz 1889283 BLAKE2B d7e7f676ca5db8322b9da2110c9a9e8eb11b13b5e9f1432ccc6ef12bf6ae7db3a28e3227fac86091589a215394ec577e91ccbffec532dabf44be746cb8a5d404 SHA512 9600bdacf5fd2defa542230b6e134920eb80e9d4c49598167b9d58887719765c174f1ac8559c0092dc1b5435274124e0b29c3d0830df86d1cfd690d67c746016 DIST crun-1.4.2.tar.gz 1956517 BLAKE2B c5db3396902c33568c3f9a490c57f8781703018f228f07bb17b1ccaa5c2ab903eda76e50d46fa3be10e440e6a0c3f791744f05d7677c71e2510673077d0acbef SHA512 cc7b57ed945cb36a36cf2ceab57349f836a07164ef31e0cec8bbddc4451a5757e2a0b92bc553b8994a236d7869cfdf229a5dd5e5a0d7f139f8c2a8df5c151d3a diff --git a/app-containers/crun/crun-0.19.1-r1.ebuild b/app-containers/crun/crun-0.19.1-r1.ebuild deleted file mode 100644 index 0590fee263af..000000000000 --- a/app-containers/crun/crun-0.19.1-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools python-any-r1 - -DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" -HOMEPAGE="https://github.com/containers/crun"; -SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"; - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc64" -IUSE="+bpf +caps criu +seccomp systemd static-libs" - -DEPEND=" - sys-kernel/linux-headers - >=dev-libs/yajl-2.0.0 - caps? ( sys-libs/libcap ) - criu? ( >=sys-process/criu-3.15 ) - seccomp? ( sys-libs/libseccomp ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - ${PYTHON_DEPS} -" - -# the crun test suite is comprehensive to the extent that tests will fail -# within a sandbox environment, due to the nature of the privileges -# required to create linux "containers". -RESTRICT="test" - -DOCS=( README.md ) - -PATCHES=( "${FILESDIR}/libcrun-linkage.patch" ) - -src_prepare() { - default - - # for libcrun-linkage.patch - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_enable bpf) - $(use_enable caps) - $(use_enable criu) - $(use_enable seccomp) - $(use_enable systemd) - $(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '') - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - emake -C libocispec - emake crun -} - -src_install() { - emake "DESTDIR=${D}" install-exec - doman crun.1 - einstalldocs -} diff --git a/app-containers/crun/files/libcrun-linkage.patch b/app-containers/crun/files/libcrun-linkage.patch deleted file mode 100644 index 72156ac931c8..000000000000 --- a/app-containers/crun/files/libcrun-linkage.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7cfdf094071fcff038bab573c1eeee599fa17b16 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakov...@gentoo.org> -Date: Mon, 2 Aug 2021 03:53:25 -0700 -Subject: [PATCH] Makefile.am: link libcrun to $(FOUND_LIBS) - -otherwise libcrun consumers fail at runtime with -symbol lookup errors - -Closes: https://github.com/containers/crun/issues/711 -Issue: https://github.com/containers/crun/issues/340 -Downstream-bug: https://bugs.gentoo.org/717750 -Signed-off-by: Georgy Yakovlev <gyakov...@gentoo.org> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 150e933a..7e5a4406 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -46,7 +46,7 @@ libocispec/libocispec.la: - - libcrun_la_SOURCES = $(libcrun_SOURCES) - libcrun_la_CFLAGS = -I $(abs_top_builddir)/libocispec/src -I $(abs_top_srcdir)/libocispec/src -fvisibility=hidden --libcrun_la_LIBADD = libocispec/libocispec.la $(maybe_libyajl.la) -+libcrun_la_LIBADD = libocispec/libocispec.la $(FOUND_LIBS) $(maybe_libyajl.la) - libcrun_la_LDFLAGS = -Wl,--version-script=$(abs_top_srcdir)/libcrun.lds - - # build a version with all the symbols visible for testing
