summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-10-22 15:19:42 -0400
committerMike Gilbert <floppym@gentoo.org>2015-10-22 15:19:50 -0400
commitd70d0aa7803688a772677e2868a11b96904b56f7 (patch)
tree101c28f9a02f9922d0e8060b1c8083e3c3453839 /sys-apps/dbus
parentapp-portage/smart-live-rebuild: Add python3.5 support (diff)
downloadgentoo-d70d0aa7803688a772677e2868a11b96904b56f7.tar.gz
gentoo-d70d0aa7803688a772677e2868a11b96904b56f7.tar.bz2
gentoo-d70d0aa7803688a772677e2868a11b96904b56f7.zip
sys-apps/dbus: Fix machine-id symlink when ROOT != /
Bug: https://bugs.gentoo.org/560646 Package-Manager: portage-2.2.23_p7
Diffstat (limited to 'sys-apps/dbus')
-rw-r--r--sys-apps/dbus/dbus-1.8.16.ebuild2
-rw-r--r--sys-apps/dbus/dbus-1.8.18.ebuild2
-rw-r--r--sys-apps/dbus/dbus-1.8.20.ebuild2
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 1bba9db1416d..c9b188da442b 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 824ceb85a73f..ed5e8b23aeda 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 824ceb85a73f..ed5e8b23aeda 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"