commit: 80123fa788e126d9f9bf23e824030e428afba39c Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Sat Feb 18 15:41:52 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 21 08:01:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80123fa7
sys-apps/s6-linux-init: add 1.1.0.0 The package newly installs library to /lib* rather tahn /usr/lib* because utilities are installed to /bin, therefore, they should link shared libraries from /lib*. The /lib/s6 destination is configured for helper utilities instead of /usr/libexec. None are installed right now, but this is for consistency with sys-apps/s6 ans sys-apps/s6-rc. Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/s6-linux-init/Manifest | 1 + .../s6-linux-init/s6-linux-init-1.1.0.0.ebuild | 75 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest index 8387575cf922..27295762840a 100644 --- a/sys-apps/s6-linux-init/Manifest +++ b/sys-apps/s6-linux-init/Manifest @@ -1,2 +1,3 @@ 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 +DIST s6-linux-init-1.1.0.0.tar.gz 58588 BLAKE2B c2560a8decdf0ce1570391f1c6915d2368cf2457f30c8432501121f6bd78752f51bfa00d799d5ec0dbfe09addc6bc3822e723261f5db67558f7f111bd0f3df16 SHA512 4d96a7e9786c085445970290bdb77d763b912f8405fa2ca5ccd01c31e18bee67ca4b420f222a7ea599376a9ab4a89269cb7756ef15138b191168bfd01366c3a6 diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild new file mode 100644 index 000000000000..795a17748e77 --- /dev/null +++ b/sys-apps/s6-linux-init/s6-linux-init-1.1.0.0.ebuild @@ -0,0 +1,75 @@ +# 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="/$(get_libdir)" + --skeldir=/etc/s6-linux-init/skel + --libdir="/usr/$(get_libdir)/${PN}" + --libexecdir=/lib/s6 + --with-dynlib="/$(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." +}
