commit: d70d0aa7803688a772677e2868a11b96904b56f7 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Oct 22 19:19:42 2015 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Oct 22 19:19:50 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70d0aa7
sys-apps/dbus: Fix machine-id symlink when ROOT != / Bug: https://bugs.gentoo.org/560646 Package-Manager: portage-2.2.23_p7 sys-apps/dbus/dbus-1.8.16.ebuild | 2 +- sys-apps/dbus/dbus-1.8.18.ebuild | 2 +- sys-apps/dbus/dbus-1.8.20.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-apps/dbus/dbus-1.8.16.ebuild b/sys-apps/dbus/dbus-1.8.16.ebuild index 1bba9db..c9b188d 100644 --- a/sys-apps/dbus/dbus-1.8.16.ebuild +++ b/sys-apps/dbus/dbus-1.8.16.ebuild @@ -223,7 +223,7 @@ pkg_postinst() { # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse # dependencies with hardcoded paths (although the known ones got fixed already) dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id - ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id + ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id if [[ ${CHOST} == *-darwin* ]]; then local plist="org.freedesktop.dbus-session.plist" diff --git a/sys-apps/dbus/dbus-1.8.18.ebuild b/sys-apps/dbus/dbus-1.8.18.ebuild index 824ceb8..ed5e8b2 100644 --- a/sys-apps/dbus/dbus-1.8.18.ebuild +++ b/sys-apps/dbus/dbus-1.8.18.ebuild @@ -227,7 +227,7 @@ pkg_postinst() { # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse # dependencies with hardcoded paths (although the known ones got fixed already) dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id - ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id + ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id if [[ ${CHOST} == *-darwin* ]]; then local plist="org.freedesktop.dbus-session.plist" diff --git a/sys-apps/dbus/dbus-1.8.20.ebuild b/sys-apps/dbus/dbus-1.8.20.ebuild index 824ceb8..ed5e8b2 100644 --- a/sys-apps/dbus/dbus-1.8.20.ebuild +++ b/sys-apps/dbus/dbus-1.8.20.ebuild @@ -227,7 +227,7 @@ pkg_postinst() { # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse # dependencies with hardcoded paths (although the known ones got fixed already) dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id - ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id + ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id if [[ ${CHOST} == *-darwin* ]]; then local plist="org.freedesktop.dbus-session.plist"
