blob: c48550d5c0837b24b4767a36f690f0661cbb6b99 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
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(-)
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
|
