From 0abe80a736147a55fbae630aaf3b7bd70493b74a Mon Sep 17 00:00:00 2001 From: Michael Olbrich 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 Signed-off-by: Marc Kleine-Budde --- dbus/Makefile.am | 2 +- tools/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: dbus-1.4.1/dbus/Makefile.am =================================================================== --- dbus-1.4.1.orig/dbus/Makefile.am +++ dbus-1.4.1/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"\" Index: dbus-1.4.1/tools/Makefile.am =================================================================== --- dbus-1.4.1.orig/tools/Makefile.am +++ dbus-1.4.1/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_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_MACHINE_UUID_FILE=\""$(localstatedir)/run/dbus/machine-id"\" extra_bin_programs= if DBUS_UNIX