diff options
| author |   Z. Liu <zhixu.liu@gmail.com> | 2024-09-09 16:55:05 +0800 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2024-10-07 11:31:02 -0400 |
| commit | cb893880b4741d78a58b005a005985bbf7dc0dd8 (patch) | |
| tree | f5ca6b39de23cd05ae06b37675008c542bc959e9 /sys-process | |
| parent | xfce-base/xfdesktop: Pin to older libxfce4windowing API (diff) | |
| download | gentoo-cb893880b4741d78a58b005a005985bbf7dc0dd8.tar.gz gentoo-cb893880b4741d78a58b005a005985bbf7dc0dd8.tar.bz2 gentoo-cb893880b4741d78a58b005a005985bbf7dc0dd8.zip | |
sys-process/runit: fix path issue
1. install binary to /usr (remove 'into /')
2. handle symlink of /sbin/runsvdir-start by USE split-usr
Closes: https://bugs.gentoo.org/904989
Closes: https://bugs.gentoo.org/935656
Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38531
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-process')
| -rw-r--r-- | sys-process/runit/runit-2.1.2-r6.ebuild (renamed from sys-process/runit/runit-2.1.2-r5.ebuild) | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys-process/runit/runit-2.1.2-r5.ebuild b/sys-process/runit/runit-2.1.2-r6.ebuild index 7d747bcca298..018348aa5796 100644 --- a/sys-process/runit/runit-2.1.2-r5.ebuild +++ b/sys-process/runit/runit-2.1.2-r6.ebuild @@ -17,7 +17,7 @@ S=${WORKDIR}/admin/${P}/src LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="static" +IUSE="split-usr static" RDEPEND="sys-apps/openrc" @@ -50,11 +50,14 @@ src_configure() { } src_install() { - into / dobin $(<../package/commands) dodir /sbin - mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin" - dosym ../etc/runit/2 /sbin/runsvdir-start + mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin" + if use split-usr ; then + dosym ../etc/runit/2 /sbin/runsvdir-start + else + dosym ../../etc/runit/2 /sbin/runsvdir-start + fi DOCS=( ../package/{CHANGES,README,THANKS,TODO} ) HTML_DOCS=( ../doc/*.html ) |