From 14d1991fe7b8977b623b9b3705352c129109bacd Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 1 Jan 2015 09:57:46 -0800 Subject: [PATCH] systemd: copy symlink-usr handling from old systemd-sysv-utils ebuild While moving from systemd-sysv-utils to systemd w/ USE=sysv-utils I forgot that USE=symlink-usr needed special handling to ensure the symlinks were created correctly. --- .../{systemd-218-r1.ebuild => systemd-218-r2.ebuild} | 10 ++++++---- .../sys-apps/systemd/systemd-9999.ebuild | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-218-r1.ebuild => systemd-218-r2.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r2.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r2.ebuild index a8e8dc538b..9520b20b69 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r2.ebuild @@ -38,8 +38,8 @@ IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb" -# Gentoo removed this use flag, we'll keep it for now -IUSE+=" nls" +# Gentoo removed the nls use flag, we'll keep it for now +IUSE+=" nls symlink-usr" MINKV="3.8" @@ -372,10 +372,12 @@ multilib_src_install_all() { einstalldocs if use sysv-utils; then + local prefix + use symlink-usr && prefix=/usr for app in halt poweroff reboot runlevel shutdown telinit; do - dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} + dosym /usr/bin/systemctl ${prefix}/sbin/${app} done - dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init + dosym /usr/lib/systemd/systemd ${prefix}/sbin/init else # we just keep sysvinit tools, so no need for the mans rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index e9b2678fe5..ad5e50207a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -38,8 +38,8 @@ IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb" -# Gentoo removed this use flag, we'll keep it for now -IUSE+=" nls" +# Gentoo removed the nls use flag, we'll keep it for now +IUSE+=" nls symlink-usr" MINKV="3.8" @@ -368,10 +368,12 @@ multilib_src_install_all() { einstalldocs if use sysv-utils; then + local prefix + use symlink-usr && prefix=/usr for app in halt poweroff reboot runlevel shutdown telinit; do - dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} + dosym /usr/bin/systemctl ${prefix}/sbin/${app} done - dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init + dosym /usr/lib/systemd/systemd ${prefix}/sbin/init else # we just keep sysvinit tools, so no need for the mans rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \