From b4f310ee794cf2353cd7439053671811ba7fa3a4 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Mon, 17 Aug 2020 19:32:43 +0200
Subject: [PATCH] sys-process/tini: Apply our modifications

---
 .../coreos-overlay/sys-process/tini/README.md |  5 ++
 .../sys-process/tini/tini-0.18.0.ebuild       | 67 +++++++------------
 2 files changed, 30 insertions(+), 42 deletions(-)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-process/tini/README.md

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/tini/README.md b/sdk_container/src/third_party/coreos-overlay/sys-process/tini/README.md
new file mode 100644
index 0000000000..b7ea2dcbde
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/sys-process/tini/README.md
@@ -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)).
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-process/tini/tini-0.18.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-process/tini/tini-0.18.0.ebuild
index fa232a3f35..c9dec97937 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-process/tini/tini-0.18.0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-process/tini/tini-0.18.0.ebuild
@@ -1,9 +1,16 @@
 # 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
 
-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
 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"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+args +static"
+# 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() {
-	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=(
-		# 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-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
+	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
 }