mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-28 14:01:43 +01:00
sys-process/tini: Sync with Gentoo
It's from Gentoo commit 7aca3f93a96dfc8e2fac9cf6df70140feff7388b.
This commit is contained in:
parent
95a53085a2
commit
2f5b3b0356
10
sdk_container/src/third_party/portage-stable/sys-process/tini/files/tini-0.19.0-cmake4.patch
vendored
Normal file
10
sdk_container/src/third_party/portage-stable/sys-process/tini/files/tini-0.19.0-cmake4.patch
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
Version bump for compatibility with CMake 4
|
||||
https://bugs.gentoo.org/951903
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required (VERSION 2.8.0)
|
||||
+cmake_minimum_required (VERSION 3.5.0)
|
||||
project (tini C)
|
||||
|
||||
# Config
|
||||
71
sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r2.ebuild
vendored
Normal file
71
sdk_container/src/third_party/portage-stable/sys-process/tini/tini-0.19.0-r2.ebuild
vendored
Normal file
@ -0,0 +1,71 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
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}/${P}-musl-basename.patch"
|
||||
"${FILESDIR}/${P}-cmake4.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
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user