From 667bed65fa1bad51f9a0b814b9e38cd9ef1a33e7 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 16 Jun 2025 07:14:58 +0000 Subject: [PATCH] sys-process/tini: Sync with Gentoo It's from Gentoo commit 452ef90203e34df455964fff4e254854b4067f7c. --- .../sys-process/tini/tini-0.19.0-r1.ebuild | 68 ------------------- .../sys-process/tini/tini-0.19.0-r2.ebuild | 2 +- 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r1.ebuild deleted file mode 100644 index f55bbf7f30..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -# guard against forgetfulness, https://bugs.gentoo.org/795936 -GIT_COMMIT_0190="de40ad007797e0dcd8b7126f27bb87401d224240" -GIT_COMMIT="GIT_COMMIT_${PV//./}" -GIT_COMMIT="${!GIT_COMMIT}" - -DESCRIPTION="A tiny but valid init for containers" -HOMEPAGE="https://github.com/krallin/tini" -SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ppc64 ~riscv ~x86" -IUSE="+args +static" - -PATCHES=("${FILESDIR}/tini-0.19.0-musl-basename.patch") - -src_prepare() { - - [[ -z ${GIT_COMMIT} ]] && die "forgetful maintainer! please define GIT_COMMIT_${PV//./} on bump" - - cmake_src_prepare - - local sed_args=( - # Do not strip binary - -e 's/-Wl,-s")$/")/' - - # Remove -Werror and -pedantic-errors in order to allow macro - # redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not - # trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2) - # in CMakeLists.txt (bug 626438). - -e "s/ -Werror / /" - -e "s/ -pedantic-errors / /" - ) - - sed -i "${sed_args[@]}" \ - -e "s/git.*status --porcelain.*/true/" \ - -e "s/git.*log -n 1.*/true/" \ - -e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \ - CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=() - use args || mycmakeargs+=(-DMINIMAL=ON) - - cmake_src_configure -} - -src_compile() { - append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37 - cmake_src_compile -} - -src_install() { - cmake_src_install - if use static; then - mv "${ED}"/usr/bin/{${PN}-static,${PN}} || die - else - rm "${ED}"/usr/bin/${PN}-static || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r2.ebuild index ac403b354f..7cda7f7e38 100644 --- a/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 hppa ppc64 ~riscv ~x86" IUSE="+args +static" PATCHES=(