diff options
Diffstat (limited to 'app-emulation/crun')
| -rw-r--r-- | app-emulation/crun/Manifest | 8 | ||||
| -rw-r--r-- | app-emulation/crun/crun-0.14.1.ebuild (renamed from app-emulation/crun/crun-0.13.ebuild) | 26 | ||||
| -rw-r--r-- | app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch | 31 | ||||
| -rw-r--r-- | app-emulation/crun/metadata.xml | 9 |
4 files changed, 28 insertions, 46 deletions
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest index 0106984da6b2..745b675e1bdb 100644 --- a/app-emulation/crun/Manifest +++ b/app-emulation/crun/Manifest @@ -1,4 +1,4 @@ -AUX libocispec-deduplicate-json_common-in-makefile-am.patch 1038 BLAKE2B 38f49d55ad043a94ecbf977adec35e0ef3627b018c572e5190fc7dc08748cd7aff5035e43d5256b69d497eb39e9bf17501be5084f8e19b81594c14a3a449b0d9 SHA512 4044d46cd3f0de139536b54876f68da5e1d18ace6e052dde1fadb5158ebb1e615714e86ca145ae2b804b1956d804e6c2bfff0796cdffe8bdb5f730ee3710f9d2 -DIST crun-0.13.tar.gz 1305048 BLAKE2B fbffabf4cfc744522147b47c5e2bf2bc48e074866108ec4ec8ab94e7ebdc39451851696fabde268b5853e1c3fafb0ac93527e08fdb766acebdd7cf952a9e1a9e SHA512 314612eaf3097160e9369b3400ac8a83e173ef1a53295191c925e96212ba00d032883db1e4615b8ba42ddb08f1e31ca5e5088ea583a469835ac3c27087a88d6e -EBUILD crun-0.13.ebuild 1571 BLAKE2B 539926e2cbee09ab60f03e80f362cc77b3338877531521b7d1047efc5a61784e40e97ef506223ab35224f04672149141094b6f0959b3cb910289fb6bb407cf76 SHA512 19e336c04e4eb9d3299ecf9c9dc6c06a5cf967d11fdc156bb6a1d7c8d5ae88a559d5b5c069c8b7122754056f4a088b97da650a66e3a97f5f45fa5d0345f504f8 -MISC metadata.xml 1031 BLAKE2B e0351ab86fa999bd962aa4b793df9dedc431885033d759590dcd4f3abb47436b7f83832138fe78c413898a04af97326d806b96b5f41b25b1ef1da0e10f947a53 SHA512 34e3e9fd8819f5fcf698a0f80acd99465b6fefb2aa33ddef9a302ced25a0eee4e522768a65e09ec3c1f9f7042f98b603978d502ef3dcea24a39bde4ded42c7d3 +DIST crun-0.14.1.tar.gz 1341891 BLAKE2B c20d5001161e298050ddca859fa78487fe3f8577ef0b06eb5515056f19ba4f981debeb684148de49111a0370b9bafb7f6454d65f7ecf087862c697a162c9b377 SHA512 420f1713653cbd17df83b2a63d163aaa41baf78115b093877a2241305e10b2ceeaf08ea6700658eca894729ff8a20cbc66f868d18d27fba3fbedf1a9993b122e +DIST libcrun.lds 257 BLAKE2B 00e7cdf3162ea0b7231dbb9037b192bcf5ffa83316e1aa60268560bc9fe8302be351c405861f9dfc06620ea64561a9226f58b7133039c0af1299dc4088b98272 SHA512 0e9b836c79ee4ad7ff33c592eca8ff41f38aed588f2f5a2416bed82efa819cd4c61ad65a2dfd11a37838a19d950688b1d5adb3b75841963dbb589536e8a867f7 +EBUILD crun-0.14.1.ebuild 1698 BLAKE2B f8b3fe2950bb13c7c0e48c28fb8c96f2949931e23ae10f57d0068a05fdd9211c82d118e11b3c215315020be53cdb765607bd0296401e645496116c544cc4e62d SHA512 7d1afe84e4bbd213a02f33d00b307d97db495ddabfa438b22cac6e160e0ea27d83bc5ed95ebd8cab3a94b009b2b590c7ff0f3a651d00fa89ee44355fbfa1df1b +MISC metadata.xml 1251 BLAKE2B 5eb63702a134f4bd41c22ea2709f628ad5ba90c4b1c1d69527b73aa25a25b2afd155c08e06f4efc1f3cfd2bc84051d54ad320a8c9348bd1d82ffafaba67a999c SHA512 b7562b7b9c677be491ee1c281c9432ee3158b5e9b1149ebad510f5b07e53ce9c6ba225b57241c9476c918ab2fc539289af35db2df41e7b89c39be3fe3809b95d diff --git a/app-emulation/crun/crun-0.13.ebuild b/app-emulation/crun/crun-0.14.1.ebuild index 5b014ac1198d..afa4cc5bdb2e 100644 --- a/app-emulation/crun/crun-0.13.ebuild +++ b/app-emulation/crun/crun-0.14.1.ebuild @@ -9,12 +9,13 @@ 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" +SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz + https://github.com/containers/${PN}/raw/${PV}/libcrun.lds" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" KEYWORDS="~amd64" -IUSE="bpf +caps doc seccomp systemd static-libs" +IUSE="bpf +caps man seccomp systemd static-libs" DEPEND=" dev-libs/yajl @@ -25,7 +26,7 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND=" ${PYTHON_DEPS} - doc? ( dev-go/go-md2man ) + man? ( dev-go/go-md2man ) " # the crun test suite is comprehensive to the extent that tests will fail @@ -35,37 +36,42 @@ RESTRICT="test" DOCS=( README.md ) -PATCHES=( - # see https://709982.bugs.gentoo.org/attachment.cgi?id=614208 - "${FILESDIR}/libocispec-deduplicate-json_common-in-makefile-am.patch" -) +src_unpack() { + # dont' try to unpack the .lds file + A=( ${A[@]/libcrun.lds} ) + unpack ${A} +} src_prepare() { default eautoreconf + cp -v ${DISTDIR}/libcrun.lds ${S}/ || die "libcrun.lds could not be copied" } src_configure() { - econf \ + local myeconfargs=( --disable-criu \ $(use_enable bpf) \ $(use_enable caps) \ $(use_enable seccomp) \ $(use_enable systemd) \ $(usex static-libs '--enabled-shared --enabled-static' '--enable-shared --disable-static' '' '') + ) + + econf "${myeconfargs[@]}" } src_compile() { emake -C libocispec emake crun - if use doc ; then + if use man ; then emake generate-man fi } src_install() { emake "DESTDIR=${D}" install-exec - if use doc ; then + if use man ; then emake "DESTDIR=${D}" install-man fi diff --git a/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch b/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch deleted file mode 100644 index 234ac20ad8d2..000000000000 --- a/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9d58891c058efa55c7b95cb90597d4cadc5c66d8 Mon Sep 17 00:00:00 2001 -From: Bruce Guenter <bruce@untroubled.org> -Date: Mon, 17 Feb 2020 13:54:14 -0600 -Subject: [PATCH] De-duplicate json_common in Makefile.am - -The source file src/json_common.c is listed twice in Makefile.am, -leading libtool to produce an archive with duplicated symbols. This -change removes the duplicate source. - -This was introduced in commit 2e318803a2c49521ea448e3ae010b1564a7e95ed - -Signed-off-by: Bruce Guenter <bruce@untroubled.org> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 65bed45..c7ede83 100644 ---- a/libocispec/Makefile.am -+++ b/libocispec/Makefile.am -@@ -7,7 +7,7 @@ GITIGNOREFILES = build-aux/ gtk-doc.make config.h.in aclocal.m4 - noinst_LTLIBRARIES = libocispec.la - noinst_LIBRARIES = libocispec.a - --SOURCE_FILES = src/json_common.c \ -+SOURCE_FILES = \ - src/image_spec_schema_config_schema.c \ - src/image_spec_schema_content_descriptor.c \ - src/image_spec_schema_defs.c \ --- -2.24.1 diff --git a/app-emulation/crun/metadata.xml b/app-emulation/crun/metadata.xml index 53609eb7d97b..75532b362a49 100644 --- a/app-emulation/crun/metadata.xml +++ b/app-emulation/crun/metadata.xml @@ -1,7 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>robert@gnzler.io</email> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription lang="en"> While most of the tools used in the Linux containers ecosystem are written in Go, crun authors believe C is a better fit for a lower level tool like a @@ -20,5 +26,6 @@ <flag name="bpf">Enable in Kernel, eBPF (enhanced Berkley Packet Filter) support for managing device controllers. </flag> + <flag name="man">Build and install man pages</flag> </use> </pkgmetadata> |