From fe9f13cf6189140f1e89481cb87a0f544a50657c Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 18 Jul 2017 12:56:24 -0400 Subject: [PATCH] sys-apps/systemd: use relative symlinks for systemd and systemd-shutdown Bug: https://bugs.gentoo.org/625462 Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84 --- .../systemd/{systemd-234-r1.ebuild => systemd-234-r2.ebuild} | 4 ++-- sys-apps/systemd/systemd-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename sys-apps/systemd/{systemd-234-r1.ebuild => systemd-234-r2.ebuild} (98%) diff --git a/sys-apps/systemd/systemd-234-r1.ebuild b/sys-apps/systemd/systemd-234-r2.ebuild similarity index 98% rename from sys-apps/systemd/systemd-234-r1.ebuild rename to sys-apps/systemd/systemd-234-r2.ebuild index 6aaaaf45860e..57b0f731d66e 100644 --- a/sys-apps/systemd/systemd-234-r1.ebuild +++ b/sys-apps/systemd/systemd-234-r2.ebuild @@ -332,8 +332,8 @@ multilib_src_install_all() { if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then # Avoid breaking boot/reboot - dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd - dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown fi } diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 95c11ec5e56f..78c85bbcdd16 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -331,8 +331,8 @@ multilib_src_install_all() { if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then # Avoid breaking boot/reboot - dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd - dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown fi } -- 2.26.2