mirror of
https://github.com/flatcar/scripts.git
synced 2025-10-03 03:21:43 +02:00
sys-process/tini: Apply our modifications
This commit is contained in:
parent
1fc645bdd7
commit
b4f310ee79
5
sdk_container/src/third_party/coreos-overlay/sys-process/tini/README.md
vendored
Normal file
5
sdk_container/src/third_party/coreos-overlay/sys-process/tini/README.md
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
This is a fork of gentoo's sys-process/tini package. The sole reason
|
||||||
|
that this package is in coreos-overlay and not in portage-stable is to
|
||||||
|
get rid of the build dependency on cmake, which we do not provide. The
|
||||||
|
build system is replaced with a small autotools setup (see
|
||||||
|
[files/automake](files/automake)).
|
@ -1,9 +1,16 @@
|
|||||||
# Copyright 1999-2020 Gentoo Authors
|
# Copyright 1999-2020 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
# Flatcar: Based on tini-0.18.0.ebuild from commit
|
||||||
|
# d6c89a5caedbe5cae98142ebb99974b41177aedd in gentoo repo (see
|
||||||
|
# https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-process/tini/tini-0.18.0.ebuild?id=d6c89a5caedbe5cae98142ebb99974b41177aedd).
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
|
||||||
inherit cmake-utils flag-o-matic
|
# Flatcar: We provide our autotools-based build system to avoid build
|
||||||
|
# dependency on cmake. So the settings are hardcoded in the build
|
||||||
|
# system - we want static binary and a non-minimal build.
|
||||||
|
inherit autotools
|
||||||
|
|
||||||
GIT_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
|
GIT_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
|
||||||
DESCRIPTION="A tiny but valid init for containers"
|
DESCRIPTION="A tiny but valid init for containers"
|
||||||
@ -12,48 +19,24 @@ SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|||||||
|
|
||||||
LICENSE="MIT"
|
LICENSE="MIT"
|
||||||
SLOT="0"
|
SLOT="0"
|
||||||
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
|
# Flatcar: We don't mark arm64 as "testing".
|
||||||
IUSE="+args +static"
|
KEYWORDS="amd64 arm64"
|
||||||
|
# Flatcar: No IUSE on args or on static - it's hardcoded in the build
|
||||||
|
# system replacement.
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
cmake-utils_src_prepare
|
# Flatcar: We don't use cmake, so all the code handling cmake
|
||||||
|
# stuff is dropped. Autotools provide the standard configure
|
||||||
|
# && make && make install build protocol, which Gentoo handles
|
||||||
|
# out of the box.
|
||||||
|
for file in configure.ac Makefile.am src/Makefile.am; do
|
||||||
|
cp "${FILESDIR}/automake/${file}" "${S}/${file}"
|
||||||
|
done
|
||||||
|
eapply_user
|
||||||
|
|
||||||
local sed_args=(
|
export tini_VERSION_MAJOR=$(ver_cut 1)
|
||||||
# Do not strip binary
|
export tini_VERSION_MINOR=$(ver_cut 2)
|
||||||
-e 's/-Wl,-s")$/")/'
|
export tini_VERSION_PATCH=$(ver_cut 3)
|
||||||
|
export tini_VERSION_GIT=${GIT_COMMIT}
|
||||||
# Remove -Werror and -pedantic-errors in order to allow macro
|
eautoreconf
|
||||||
# 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-utils_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
append-cflags -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37
|
|
||||||
cmake-utils_src_compile
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
cmake-utils_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