| 1 |
commit: 6be6d71b928d0ce74611604592c7e74cce70b0ab |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 27 04:04:17 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 27 04:04:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be6d71b |
| 7 |
|
| 8 |
sys-apps/systemd: EPREFIX tweaks |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61 |
| 11 |
|
| 12 |
sys-apps/systemd/systemd-9999.ebuild | 23 ++++++++++++----------- |
| 13 |
1 file changed, 12 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 16 |
index 60be1bfc79b..aacb665331d 100644 |
| 17 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 18 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 19 |
@@ -199,9 +199,10 @@ meson_ml_use() { |
| 20 |
multilib_src_configure() { |
| 21 |
local myconf=( |
| 22 |
--buildtype=plain |
| 23 |
- --prefix=/usr |
| 24 |
+ --prefix="${EPREFIX}/usr" |
| 25 |
--libdir="$(get_libdir)" |
| 26 |
- --localstatedir=/var |
| 27 |
+ --sysconfdir="${EPREFIX}/etc" |
| 28 |
+ --localstatedir="${EPREFIX}/var" |
| 29 |
-Dpamlibdir="$(getpam_mod_dir)" |
| 30 |
# avoid bash-completion dep |
| 31 |
-Dbashcompletiondir="$(get_bashcompdir)" |
| 32 |
@@ -313,9 +314,9 @@ multilib_src_install_all() { |
| 33 |
dosym "..${ROOTPREFIX%/}/lib/systemd/systemd" /sbin/init |
| 34 |
else |
| 35 |
# we just keep sysvinit tools, so no need for the mans |
| 36 |
- rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
| 37 |
+ rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ |
| 38 |
|| die |
| 39 |
- rm "${D}"/usr/share/man/man1/init.1 || die |
| 40 |
+ rm "${ED%/}"/usr/share/man/man1/init.1 || die |
| 41 |
fi |
| 42 |
|
| 43 |
# Preserve empty dirs in /etc & /var, bug #437008 |
| 44 |
@@ -328,13 +329,13 @@ multilib_src_install_all() { |
| 45 |
|
| 46 |
# If we install these symlinks, there is no way for the sysadmin to remove them |
| 47 |
# permanently. |
| 48 |
- rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die |
| 49 |
- rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die |
| 50 |
- rm -r "${D}"/etc/systemd/system/network-online.target.wants || die |
| 51 |
- rm -r "${D}"/etc/systemd/system/sockets.target.wants || die |
| 52 |
- rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die |
| 53 |
+ rm "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die |
| 54 |
+ rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die |
| 55 |
+ rm -r "${ED%/}"/etc/systemd/system/network-online.target.wants || die |
| 56 |
+ rm -r "${ED%/}"/etc/systemd/system/sockets.target.wants || die |
| 57 |
+ rm -r "${ED%/}"/etc/systemd/system/sysinit.target.wants || die |
| 58 |
|
| 59 |
- rm -r "${D}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die |
| 60 |
+ rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die |
| 61 |
} |
| 62 |
|
| 63 |
migrate_locale() { |
| 64 |
@@ -403,7 +404,7 @@ pkg_postinst() { |
| 65 |
# Keep this here in case the database format changes so it gets updated |
| 66 |
# when required. Despite that this file is owned by sys-apps/hwids. |
| 67 |
if has_version "sys-apps/hwids[udev]"; then |
| 68 |
- udevadm hwdb --update --root="${ROOT%/}" |
| 69 |
+ udevadm hwdb --update --root="${EROOT%/}" |
| 70 |
fi |
| 71 |
|
| 72 |
udev_reload || FAIL=1 |
Archives