From c2e5e035af0268fde73be31a46ccdb2aed7a76d9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 13 Jan 2025 07:04:46 +0000 Subject: [PATCH] app-containers/crun: Sync with Gentoo It's from Gentoo commit 705b7bf5adcb8b95bc65fe005dcffbe419435dda. --- .../app-containers/crun/Manifest | 3 +- .../app-containers/crun/crun-1.17.ebuild | 23 +++--- ...{crun-1.11.2.ebuild => crun-1.19.1.ebuild} | 44 +++++------ .../app-containers/crun/crun-1.8.4.ebuild | 73 ------------------- 4 files changed, 35 insertions(+), 108 deletions(-) rename sdk_container/src/third_party/portage-stable/app-containers/crun/{crun-1.11.2.ebuild => crun-1.19.1.ebuild} (60%) delete mode 100644 sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.8.4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/app-containers/crun/Manifest b/sdk_container/src/third_party/portage-stable/app-containers/crun/Manifest index 6681d587bd..1623112afe 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/crun/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-containers/crun/Manifest @@ -1,5 +1,4 @@ -DIST crun-1.11.2.tar.xz 738176 BLAKE2B ef13475089c87599159ce00dd26fbb19c7f2bb9564352c1f8040925e521bb924cf28a8d1f37cc95ce7d1b2797b8654740e9ad08352e357c8c9e2d176466101e0 SHA512 ae35ffb9bd1c7acebfd7f6236fa6a7ad524593d8f2cea1203f0e89023e9791d2d5bbc5c5cfc32ee5f18ad80662a1659076ab5f4d5ff74c6026842f2dd12be977 DIST crun-1.14.3.tar.xz 750456 BLAKE2B 5a63b5da2f85ff1a83d4589be224c5b7a1123b6d7714b90a63c1907b78d42392aff25ffe5d9a4127173ac47026d57e9c93a39f5ba4b07de7f9f3722c14e6d203 SHA512 d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1 DIST crun-1.16.tar.gz 1759549 BLAKE2B 1dfdf9177ae52e627c92e70e48a558bb355c87f629e95f1debaf6b7d8c38802110bd796545d5b2dbe3cac7f8de1f9c94e9b5f046cc618e73afd4c434188d585c SHA512 718e17abdb8c2a9e1fdd39f09e7e3e435d88c5785cc13c1e67f492847d7d938cf399aecc055ecf88720fa8f73b8539f057e3b0e53f10f4e382f5664a2243b959 DIST crun-1.17.tar.gz 1773153 BLAKE2B 9f75cb6879e0b8cd47bb8939c1cf6f88d5e13e6d8932c652ea20c64501bc69fbda84dd061866a9c08e353848f39d1022bf67fbc0d160d5ef7fdc08c1edec03f9 SHA512 7556467c5e0e93bb7321e2e88de8a2f537340e3e0acaa5501eab8deb0f4bb93c4561f8d063156789d3ee98fdd49069fc52c0ed0c773bd44db476eeeccc16aa1a -DIST crun-1.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0 +DIST crun-1.19.1.tar.gz 1786019 BLAKE2B 555f7c917c9e9ed80919b708cd711890d47c395b5b6fa1c2b542d311176941c5ece23bd7ff0cb4c3dcf81be4f46fec21fa8127da57092657157707537771dfe1 SHA512 6cb6148a3b6e18b4dbb0178ea23eaaa57c040781a34b5c5c5dac71be513941717011fe996a7400b9dee0a73f7f0dd2fc36544fe72382a3f2543e4de90589fe6a diff --git a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.17.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.17.ebuild index c2730e40b5..b543813618 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.17.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2024 Gentoo Authors +# Copyright 2019-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ if [[ "$PV" == *9999* ]]; then EGIT_REPO_URI="https://github.com/containers/${PN}.git" else SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv" + KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv" fi LICENSE="GPL-2+ LGPL-2.1+" @@ -39,6 +39,7 @@ BDEPEND=" src_configure() { local myeconfargs=( + --cache-file="${S}"/config.cache $(use_enable bpf) $(use_enable caps) $(use_enable criu) @@ -50,15 +51,6 @@ src_configure() { econf "${myeconfargs[@]}" } -src_install() { - emake "DESTDIR=${D}" install-exec - doman crun.1 - einstalldocs - - einfo "Cleaning up .la files" - find "${ED}" -name '*.la' -delete || die -} - src_test() { emake check-TESTS -C ./libocispec @@ -73,3 +65,12 @@ src_test() { ) emake check-TESTS TESTS="${supported_tests[*]}" } + +src_install() { + emake "DESTDIR=${D}" install-exec + doman crun.1 + einstalldocs + + einfo "Cleaning up .la files" + find "${ED}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.11.2.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.19.1.ebuild similarity index 60% rename from sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.11.2.ebuild rename to sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.19.1.ebuild index 029066f588..f1b4ab0666 100644 --- a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.11.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.19.1.ebuild @@ -1,23 +1,28 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit 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.xz" + +if [[ "$PV" == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/containers/${PN}.git" +else + SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv" +fi LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" IUSE="+bpf +caps criu +seccomp selinux systemd static-libs" DEPEND=" - dev-libs/libgcrypt:= dev-libs/yajl:= sys-kernel/linux-headers caps? ( sys-libs/libcap ) @@ -32,12 +37,6 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( - # merged upstream: https://github.com/containers/crun/pull/1345 - # drop when we get 1.11.3 - "${FILESDIR}/${P}-caps.patch" -) - src_configure() { local myeconfargs=( --cache-file="${S}"/config.cache @@ -52,18 +51,19 @@ src_configure() { econf "${myeconfargs[@]}" } -src_compile() { - emake git-version.h - emake -C libocispec - emake crun -} - -# 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". -# due to this we disable most of the core test suite by unsetting PYTHON_TESTS src_test() { - emake check PYTHON_TESTS= + emake check-TESTS -C ./libocispec + + # 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". + local supported_tests=( + "tests/tests_libcrun_utils" + "tests/tests_libcrun_errors" + "tests/tests_libcrun_intelrdt" + "tests/test_oci_features" + ) + emake check-TESTS TESTS="${supported_tests[*]}" } src_install() { diff --git a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.8.4.ebuild b/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.8.4.ebuild deleted file mode 100644 index c0e0200e40..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-containers/crun/crun-1.8.4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2019-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -# Can drop autotools/eautoreconf after next release & glibc patch gone -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.xz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv" -IUSE="+bpf +caps criu +seccomp selinux systemd static-libs" - -DEPEND=" - dev-libs/libgcrypt:= - dev-libs/yajl:= - sys-kernel/linux-headers - caps? ( sys-libs/libcap ) - criu? ( >=sys-process/criu-3.15 ) - seccomp? ( sys-libs/libseccomp ) - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-container )" -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -# 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" - -src_prepare() { - default - - 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 git-version.h - emake -C libocispec - emake crun -} - -src_install() { - emake "DESTDIR=${D}" install-exec - doman crun.1 - einstalldocs - - einfo "Cleaning up .la files" - find "${ED}" -name '*.la' -delete || die -}