summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2006-10-20 10:39:36 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2006-10-20 10:39:36 +0000
commit3305e11e1a3e3aa36f9d554906c937178dad6ca9 (patch)
tree46b5f4bc0364daf5d9f806f7d55ba81b91a7e95e
parent62007c7609282d112c4f264e045dac9a6084a396 (diff)
downloadptxdist-3305e11e1a3e3aa36f9d554906c937178dad6ca9.tar.gz
ptxdist-3305e11e1a3e3aa36f9d554906c937178dad6ca9.tar.xz
* dbus: added; patch by rsc & Roland Hostettler
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6202 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r--CREDITS4
-rw-r--r--ChangeLog5
-rw-r--r--patches/dbus-0.94/generic/series1
-rw-r--r--rules/dbus.make33
4 files changed, 23 insertions, 20 deletions
diff --git a/CREDITS b/CREDITS
index 6260e1ce6..8f09b7839 100644
--- a/CREDITS
+++ b/CREDITS
@@ -50,6 +50,10 @@ S: Hannoversche Strasse 2
S: 31134 Hildesheim
S: Germany
+N: Roland Hostettler
+E: r.hostettler@gmx.ch
+D: Developer
+
N: Marc Kleine-Budde
E: m.kleine-budde@pengutronix.de
D: Maintainer
diff --git a/ChangeLog b/ChangeLog
index 7b5330d6d..2c08ec8ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-20 Robert Schwebel <r.schwebel@pengutronix.de>
+
+ * dbus: added (rsc) and added some patches to fix the
+ configuration, by Roland Hostettler
+
2006-10-17 Robert Schwebel <r.schwebel@pengutronix.de>
* util-linux: update to 2.13-pre7
diff --git a/patches/dbus-0.94/generic/series b/patches/dbus-0.94/generic/series
index df0ee035c..5940e4dc0 100644
--- a/patches/dbus-0.94/generic/series
+++ b/patches/dbus-0.94/generic/series
@@ -1,2 +1,3 @@
dbus-0.94-abstract-sockets.diff
dbus-0.94-reconf.diff.bz2
+dbus-0.94-config.diff
diff --git a/rules/dbus.make b/rules/dbus.make
index d3506e874..6bd50374d 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -65,7 +65,8 @@ DBUS_ENV := $(CROSS_ENV)
#
DBUS_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
- --enable-abstract-sockets=yes
+ --enable-abstract-sockets=yes \
+ --localstatedir=/var
$(STATEDIR)/dbus.prepare: $(dbus_prepare_deps_default)
@$(call targetinfo, $@)
@@ -115,27 +116,19 @@ $(STATEDIR)/dbus.targetinstall: $(dbus_targetinstall_deps_default)
@$(call install_fixup,dbus,DEPENDS,)
@$(call install_fixup,dbus,DESCRIPTION,missing)
- @$(call install_copy, dbus, 0, 0, 0644, \
- $(DBUS_DIR)/dbus/.libs/libdbus-1.so.3.2.0, \
- /usr/lib/libdbus-1.so.3.2.0)
- @$(call install_link, dbus, libdbus-1.so.3.2.0, /usr/lib/libdbos-1.so.3)
- @$(call install_link, dbus, libdbus-1.so.3.2.0, /usr/lib/libdbos-1.so)
+ @$(call install_copy, dbus, 0, 0, 0755, $(DBUS_DIR)/bus/dbus-daemon, /usr/bin/dbus-daemon)
+ @$(call install_copy, dbus, 0, 0, 0755, $(DBUS_DIR)/tools/dbus-cleanup-sockets, /usr/bin/dbus-cleanup-sockets)
+ @$(call install_copy, dbus, 0, 0, 0755, $(DBUS_DIR)/tools/dbus-launch, /usr/bin/dbus-launch)
+ @$(call install_copy, dbus, 0, 0, 0755, $(DBUS_DIR)/tools/.libs/dbus-monitor, /usr/bin/dbus-monitor)
+ @$(call install_copy, dbus, 0, 0, 0755, $(DBUS_DIR)/tools/.libs/dbus-send, /usr/bin/dbus-send)
+ @$(call install_copy, dbus, 0, 0, 0755, $(DBUS_DIR)/tools/.libs/dbus-uuidgen, /usr/bin/dbus-uuidgen)
- @$(call install_copy, dbus, 0, 0, 0755, \
- $(DBUS_DIR)/tools/dbus-send, \
- /usr/bin/dbus-send)
+ @$(call install_copy, dbus, 0, 0, 0644, $(DBUS_DIR)/dbus/.libs/libdbus-1.so.3.2.0, /usr/lib/libdbus-1.so.3.2.0)
+ @$(call install_link, dbus, libdbus-1.so.3.2.0, /usr/lib/libdbus-1.so.3)
+ @$(call install_link, dbus, libdbus-1.so.3.2.0, /usr/lib/libdbus-1.so)
- @$(call install_copy, dbus, 0, 0, 0755, \
- $(DBUS_DIR)/tools/dbus-launch, \
- /usr/bin/dbus-launch)
-
- @$(call install_copy, dbus, 0, 0, 0755, \
- $(DBUS_DIR)/tools/dbus-cleanup-sockets, \
- /usr/bin/dbus-cleanup-sockets)
-
- @$(call install_copy, dbus, 0, 0, 0755, \
- $(DBUS_DIR)/tools/dbus-uuidgen, \
- /usr/bin/dbus-uuidgen)
+ @$(call install_copy, dbus, 0, 0, 0644, $(DBUS_DIR)/bus/system.conf, /etc/dbus-1/system.conf)
+ @$(call install_copy, dbus, 0, 0, 0644, $(DBUS_DIR)/bus/session.conf, /etc/dbus-1/session.conf)
@$(call install_finish,dbus)