mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-17 18:31:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #526 from flatcar-linux/krnowak/tini

Browse Source 
Update sys-process/tini
This commit is contained in:
Krzesimir Nowak 2020-09-29 19:20:17 +02:00 committed by GitHub
commit 8cb4c23ad6
7 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.03.2-r1.ebuild vendored
View File

@ -65,7 +65,7 @@ RDEPEND="
~app-emulation/containerd-0.2.6[seccomp?]
~app-emulation/docker-runc-1.0.0_rc2_p136[apparmor?,seccomp?]
~app-emulation/docker-proxy-0.8.0_p20161019
container-init? ( >=sys-process/tini-0.13.0 )
container-init? ( >=sys-process/tini-0.18.0 )
"
RESTRICT="installsources strip"

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -67,7 +67,7 @@ RDEPEND="
~app-emulation/containerd-1.1.2
~app-emulation/docker-runc-1.0.0_rc92[apparmor?,seccomp?]
~app-emulation/docker-proxy-0.8.0_p20180709
container-init? ( >=sys-process/tini-0.13.1 )
container-init? ( >=sys-process/tini-0.18.0 )
"
RESTRICT="installsources strip"

2
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.03.ebuild vendored
View File

@ -15,7 +15,7 @@ RDEPEND="
~app-emulation/containerd-0.2.6
~app-emulation/docker-proxy-0.8.0_p20161019
~app-emulation/docker-runc-1.0.0_rc2_p136
=sys-process/tini-0.13.2
=sys-process/tini-0.18.0
"
src_install() {

2
sdk_container/src/third_party/coreos-overlay/sys-process/tini/Manifest vendored
View File

@ -1 +1 @@
DIST tini-0.13.2.tar.gz 27828 SHA256 85e18a4e4089612821321d1d67c16337797c3c78e81117dea56ad75ece20d05f SHA512 117822bf2e45b7cf732bfcd2aa5ea268a189c395f189c03d0e5dcd982872cff29d50adbb1a4d1b85859db4736e932900cfb64a1c487ba271a305146e9677a1d4 WHIRLPOOL f271b592e5524a2297b5a6b8fb88371a9068f01122e7ea95c4d797d2f5da91847b65675a7b5043398b8c9553746a00e4b5fe5ecfd8a1171d3bba87ee78de9a55
DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1

5
sdk_container/src/third_party/coreos-overlay/sys-process/tini/README.md vendored Normal file
View 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)).

27
sdk_container/src/third_party/coreos-overlay/sys-process/tini/tini-0.13.2.ebuild vendored
View File

@ -1,27 +0,0 @@
# Copyright 2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools versionator
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 arm64"
src_prepare() {
for file in configure.ac Makefile.am src/Makefile.am; do
cp "${FILESDIR}/automake/${file}" "${S}/${file}"
done
eapply_user
export tini_VERSION_MAJOR=$(get_version_component_range 1)
export tini_VERSION_MINOR=$(get_version_component_range 2)
export tini_VERSION_PATCH=$(get_version_component_range 3)
eautoreconf
}

42
sdk_container/src/third_party/coreos-overlay/sys-process/tini/tini-0.18.0.ebuild vendored Normal file
View File

@ -0,0 +1,42 @@
# Copyright 1999-2020 Gentoo Authors
# 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
# 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
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"
# Flatcar: We don't mark arm64 as "testing".
KEYWORDS="amd64 arm64"
# Flatcar: No IUSE on args or on static - it's hardcoded in the build
# system replacement.
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
export tini_VERSION_MAJOR=$(ver_cut 1)
export tini_VERSION_MINOR=$(ver_cut 2)
export tini_VERSION_PATCH=$(ver_cut 3)
export tini_VERSION_GIT=${GIT_COMMIT}
eautoreconf
}