Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/tini/
Date: Tue, 15 Jun 2021 02:06:25
Message-Id: 1623722746.bfd0e02c8af07b421e9a5d622c97930e97e0516d.gyakovlev@gentoo
1 commit: bfd0e02c8af07b421e9a5d622c97930e97e0516d
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 15 02:03:37 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 15 02:05:46 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd0e02c
7
8 sys-process/tini: revbump, specify correct GIT_COMMIT
9
10 straight to stable, as tarball is the same, just the commit
11 embedded into binary is wrong.
12
13 Closes: https://bugs.gentoo.org/795936
14 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
15
16 sys-process/tini/tini-0.19.0-r1.ebuild | 66 ++++++++++++++++++++++++++++++++++
17 1 file changed, 66 insertions(+)
18
19 diff --git a/sys-process/tini/tini-0.19.0-r1.ebuild b/sys-process/tini/tini-0.19.0-r1.ebuild
20 new file mode 100644
21 index 00000000000..fe80f91738d
22 --- /dev/null
23 +++ b/sys-process/tini/tini-0.19.0-r1.ebuild
24 @@ -0,0 +1,66 @@
25 +# Copyright 1999-2021 Gentoo Authors
26 +# Distributed under the terms of the GNU General Public License v2
27 +
28 +EAPI=7
29 +
30 +inherit cmake flag-o-matic
31 +
32 +# guard against forgetfulness, https://bugs.gentoo.org/795936
33 +GIT_COMMIT_0190="de40ad007797e0dcd8b7126f27bb87401d224240"
34 +GIT_COMMIT="GIT_COMMIT_${PV//./}"
35 +GIT_COMMIT="${!GIT_COMMIT}"
36 +
37 +DESCRIPTION="A tiny but valid init for containers"
38 +HOMEPAGE="https://github.com/krallin/tini"
39 +SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
40 +
41 +LICENSE="MIT"
42 +SLOT="0"
43 +KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
44 +IUSE="+args +static"
45 +
46 +src_prepare() {
47 +
48 + [[ -z ${GIT_COMMIT} ]] && die "forgetful maintainer! please define GIT_COMMIT_${PV//./} on bump"
49 +
50 + cmake_src_prepare
51 +
52 + local sed_args=(
53 + # Do not strip binary
54 + -e 's/-Wl,-s")$/")/'
55 +
56 + # Remove -Werror and -pedantic-errors in order to allow macro
57 + # redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not
58 + # trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2)
59 + # in CMakeLists.txt (bug 626438).
60 + -e "s/ -Werror / /"
61 + -e "s/ -pedantic-errors / /"
62 + )
63 +
64 + sed -i "${sed_args[@]}" \
65 + -e "s/git.*status --porcelain.*/true/" \
66 + -e "s/git.*log -n 1.*/true/" \
67 + -e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \
68 + CMakeLists.txt || die
69 +}
70 +
71 +src_configure() {
72 + local mycmakeargs=()
73 + use args || mycmakeargs+=(-DMINIMAL=ON)
74 +
75 + cmake_src_configure
76 +}
77 +
78 +src_compile() {
79 + append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
80 + cmake_src_compile
81 +}
82 +
83 +src_install() {
84 + cmake_src_install
85 + if use static; then
86 + mv "${ED}"/usr/bin/{${PN}-static,${PN}} || die
87 + else
88 + rm "${ED}"/usr/bin/${PN}-static || die
89 + fi
90 +}