From d88abf08538786885b02b0f1062253f666b58e0c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 26 Nov 2013 14:07:50 -0800 Subject: [PATCH] fix(sys-apps/systemd-sysv-utils): Change install location, not target. Change the install location based on symlink-usr instead of the target and use absolute symlinks. We need to move towards never installing to /{bin,sbin,lib...} and the use of absolute links avoids needlessly breaking if the symlink-usr flag and the current state of /bin don't agree (i.e. between flipping the flag and migrating the current files). --- ...-207-r1.ebuild => systemd-sysv-utils-207-r2.ebuild} | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/{systemd-sysv-utils-207-r1.ebuild => systemd-sysv-utils-207-r2.ebuild} (82%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r2.ebuild similarity index 82% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r2.ebuild index 86333fd470..aa1cf71835 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd-sysv-utils/systemd-sysv-utils-207-r2.ebuild @@ -21,17 +21,15 @@ RDEPEND="!sys-apps/sysvinit S=${WORKDIR}/${MY_P}/man src_install() { - local sym_prefix + local prefix="" if use symlink-usr ; then - sym_prefix=".." - else - sym_prefix="../usr" + prefix="/usr" fi for app in halt poweroff reboot runlevel shutdown telinit; do doman ${app}.8 - dosym ${sym_prefix}/bin/systemctl /sbin/${app} + dosym /usr/bin/systemctl ${prefix}/sbin/${app} done newman init.1 init.8 - dosym ${sym_prefix}/lib/systemd/systemd /sbin/init + dosym /usr/lib/systemd/systemd ${prefix}/sbin/init }