| 1 |
commit: 81f20ebb0c4714af59f9dcc1a4b2c36926e43d60 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 21 16:08:50 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 21 16:09:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f20ebb |
| 7 |
|
| 8 |
sys-apps/systemd: fix install with USE="-split-usr -sysv-utils" |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/systemd/systemd-251.4.ebuild | 7 ++++--- |
| 13 |
sys-apps/systemd/systemd-9999.ebuild | 7 ++++--- |
| 14 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/systemd/systemd-251.4.ebuild b/sys-apps/systemd/systemd-251.4.ebuild |
| 17 |
index 4a104481e51e..77e48349d5ef 100644 |
| 18 |
--- a/sys-apps/systemd/systemd-251.4.ebuild |
| 19 |
+++ b/sys-apps/systemd/systemd-251.4.ebuild |
| 20 |
@@ -368,6 +368,7 @@ multilib_src_test() { |
| 21 |
|
| 22 |
multilib_src_install_all() { |
| 23 |
local rootprefix=$(usex split-usr '' /usr) |
| 24 |
+ local sbin=$(usex split-usr sbin bin) |
| 25 |
|
| 26 |
# meson doesn't know about docdir |
| 27 |
mv "${ED}"/usr/share/doc/{systemd,${PF}} || die |
| 28 |
@@ -376,19 +377,19 @@ multilib_src_install_all() { |
| 29 |
dodoc "${FILESDIR}"/nsswitch.conf |
| 30 |
|
| 31 |
if ! use resolvconf; then |
| 32 |
- rm -f "${ED}${rootprefix}"/sbin/resolvconf || die |
| 33 |
+ rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die |
| 34 |
fi |
| 35 |
|
| 36 |
rm "${ED}"/etc/init.d/README || die |
| 37 |
rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die |
| 38 |
|
| 39 |
if ! use sysv-utils; then |
| 40 |
- rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die |
| 41 |
+ rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die |
| 42 |
rm "${ED}"/usr/share/man/man1/init.1 || die |
| 43 |
rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die |
| 44 |
fi |
| 45 |
|
| 46 |
- if ! use resolvconf && ! use sysv-utils; then |
| 47 |
+ if ! use resolvconf && ! use sysv-utils && ! use split-usr; then |
| 48 |
rmdir "${ED}${rootprefix}"/sbin || die |
| 49 |
fi |
| 50 |
|
| 51 |
|
| 52 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 53 |
index d317887a899f..733ffd2c153a 100644 |
| 54 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 55 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 56 |
@@ -365,6 +365,7 @@ multilib_src_test() { |
| 57 |
|
| 58 |
multilib_src_install_all() { |
| 59 |
local rootprefix=$(usex split-usr '' /usr) |
| 60 |
+ local sbin=$(usex split-usr sbin bin) |
| 61 |
|
| 62 |
# meson doesn't know about docdir |
| 63 |
mv "${ED}"/usr/share/doc/{systemd,${PF}} || die |
| 64 |
@@ -373,19 +374,19 @@ multilib_src_install_all() { |
| 65 |
dodoc "${FILESDIR}"/nsswitch.conf |
| 66 |
|
| 67 |
if ! use resolvconf; then |
| 68 |
- rm -f "${ED}${rootprefix}"/sbin/resolvconf || die |
| 69 |
+ rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die |
| 70 |
fi |
| 71 |
|
| 72 |
rm "${ED}"/etc/init.d/README || die |
| 73 |
rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die |
| 74 |
|
| 75 |
if ! use sysv-utils; then |
| 76 |
- rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die |
| 77 |
+ rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die |
| 78 |
rm "${ED}"/usr/share/man/man1/init.1 || die |
| 79 |
rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die |
| 80 |
fi |
| 81 |
|
| 82 |
- if ! use resolvconf && ! use sysv-utils; then |
| 83 |
+ if ! use resolvconf && ! use sysv-utils && ! use split-usr; then |
| 84 |
rmdir "${ED}${rootprefix}"/sbin || die |
| 85 |
fi |
Archives