diff options
Diffstat (limited to 'patches/dbus-1.2.14/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch')
| -rw-r--r-- | patches/dbus-1.2.14/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/patches/dbus-1.2.14/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch b/patches/dbus-1.2.14/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch new file mode 100644 index 000000000..f9d432079 --- /dev/null +++ b/patches/dbus-1.2.14/0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch @@ -0,0 +1,46 @@ +From 0abe80a736147a55fbae630aaf3b7bd70493b74a Mon Sep 17 00:00:00 2001 +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Sun, 31 May 2009 09:38:33 +0200 +Subject: [PATCH 2/3] dbus: change DBUS_MACHINE_UUID_FILE path + +Change the path for DBUS_MACHINE_UUID_FILE from /var/lib/dbus/machine-id +to /var/run/dbus/machine-id. This is necessary because /var/lib may be a +readonly filesystem. +This is a special situation in our BSPs. This patch is not intended for +upstream. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + dbus/Makefile.am | 2 +- + tools/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dbus/Makefile.am b/dbus/Makefile.am +index e966a43..c015ffe 100644 +--- a/dbus/Makefile.am ++++ b/dbus/Makefile.am +@@ -2,7 +2,7 @@ + configdir=$(sysconfdir)/dbus-1 + + INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) @PIC_CFLAGS@ -DDBUS_COMPILATION \ +- -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ ++ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" \ + -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ + -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 9fad7a7..e347afc 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -1,6 +1,6 @@ + configdir=$(sysconfdir)/dbus-1 + +-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" ++INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" + + bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets dbus-uuidgen + +-- +1.6.3.1 + |