From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5307415800F for ; Tue, 17 Jan 2023 01:53:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69D49E088C; Tue, 17 Jan 2023 01:53:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C845E088C for ; Tue, 17 Jan 2023 01:53:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34B98340D6B for ; Tue, 17 Jan 2023 01:53:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F37DE88C for ; Tue, 17 Jan 2023 01:53:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673920334.900e7eb3aaf51a2849fe91c4c0a77caf83cfe447.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/s6-linux-init/Manifest sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild X-VCS-Directories: sys-apps/s6-linux-init/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 900e7eb3aaf51a2849fe91c4c0a77caf83cfe447 X-VCS-Branch: master Date: Tue, 17 Jan 2023 01:53:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 67f5ae25-fe78-463e-bf31-528274c7c2f0 X-Archives-Hash: 06917cb6f70ce332404649020780761d commit: 900e7eb3aaf51a2849fe91c4c0a77caf83cfe447 Author: Petr Vaněk atlas cz> AuthorDate: Mon Jan 16 15:45:14 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 17 01:52:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900e7eb3 sys-apps/s6-linux-init: add 1.0.8.1 The --disable-static needs to be explicitly specified in configuration phase otherwise static libraries are created. Fixes: 5215a1214162 ("sys-apps/s6-linux-init: drop IUSE="static static-libs"") Bug: https://bugs.gentoo.org/890877 Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> sys-apps/s6-linux-init/Manifest | 1 + .../s6-linux-init/s6-linux-init-1.0.8.1.ebuild | 73 ++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest index 7dfba1589d75..8387575cf922 100644 --- a/sys-apps/s6-linux-init/Manifest +++ b/sys-apps/s6-linux-init/Manifest @@ -1 +1,2 @@ DIST s6-linux-init-1.0.8.0.tar.gz 58732 BLAKE2B 15e90b1987729f4771ffd294d2a6b4738e0e2d3438c694c1739c6c8ff8bff3a3b9c31565f446e7387fda226b4f0480c36051a593e2e8081301bc83973f9fcb5e SHA512 b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346 +DIST s6-linux-init-1.0.8.1.tar.gz 59188 BLAKE2B e0f417fb349b3f47dcaa9f36c6f40d8c58066d62ad953b8f797ce6cce14e8c337acd15d34498b49fc0f9455cf4551c948fd7f16b0947f7cdc376e762594afc3a SHA512 df3b5699f9c04ffc89d219dbc9536a64ad3d2fb1d5c5844b2fb9804ac9e223e8b16fe1084baee9b60d3ab61f228de1b57605c3c0f72227758afb16aea1c68340 diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild new file mode 100644 index 000000000000..62c217701a87 --- /dev/null +++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.8.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Generates an init binary for s6-based init systems" +HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/" +SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+sysv-utils" + +RDEPEND="dev-lang/execline:= + >=dev-libs/skalibs-2.13.0.0:= + sys-apps/s6:=[execline] + sysv-utils? ( + !sys-apps/openrc[sysv-utils(-)] + !sys-apps/systemd[sysv-utils] + !sys-apps/sysvinit + ) +" +DEPEND="${RDEPEND}" + +HTML_DOCS=( doc/. ) + +src_prepare() { + default + + # Avoid QA warning for LDFLAGS addition + sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die + + sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die +} + +src_configure() { + tc-export AR CC RANLIB + + local myconf=( + --bindir=/bin + --dynlibdir=/usr/$(get_libdir) + --skeldir=/etc/s6-linux-init/skel + --libdir=/usr/$(get_libdir)/${PN} + --with-dynlib=/usr/$(get_libdir) + --with-lib=/usr/$(get_libdir)/s6 + --with-lib=/usr/$(get_libdir)/skalibs + --with-sysdeps=/usr/$(get_libdir)/skalibs + --enable-shared + --disable-allstatic + --disable-static + --disable-static-libc + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + if use sysv-utils ; then + "${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die + into / + dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit} + fi +} + +pkg_postinst() { + einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html" + einfo "for usage instructions." +}