diff options
author | Ross Burton <ross@openedhand.com> | 2007-06-19 07:43:49 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2007-06-19 07:43:49 +0000 |
commit | 9f594e2d33d807b27e4bfbc00a0624d67f129169 (patch) | |
tree | 440224e52f68dfd00ce2376f7e224b7bed616a33 /meta/packages/dbus/dbus-1.0.1 | |
parent | 5913a0765bca2b510635c5bf9b520c6be724aa5f (diff) | |
download | poky-9f594e2d33d807b27e4bfbc00a0624d67f129169.tar.gz |
Upgrade to DBus 1.0.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1974 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/dbus/dbus-1.0.1')
-rw-r--r-- | meta/packages/dbus/dbus-1.0.1/cross.patch | 10 | ||||
-rw-r--r-- | meta/packages/dbus/dbus-1.0.1/dbus-1.init | 96 | ||||
-rw-r--r-- | meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch | 13 |
3 files changed, 0 insertions, 119 deletions
diff --git a/meta/packages/dbus/dbus-1.0.1/cross.patch b/meta/packages/dbus/dbus-1.0.1/cross.patch deleted file mode 100644 index 268a3ae3de..0000000000 --- a/meta/packages/dbus/dbus-1.0.1/cross.patch +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | --- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100 | ||
2 | +++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100 | ||
3 | @@ -719,6 +719,7 @@ | ||
4 | exit (0); | ||
5 | ]])], | ||
6 | [ac_cv_have_abstract_sockets=yes], | ||
7 | + [ac_cv_have_abstract_sockets=no], | ||
8 | [ac_cv_have_abstract_sockets=no] | ||
9 | )]) | ||
10 | AC_LANG_POP(C) | ||
diff --git a/meta/packages/dbus/dbus-1.0.1/dbus-1.init b/meta/packages/dbus/dbus-1.0.1/dbus-1.init deleted file mode 100644 index 38e7574ad5..0000000000 --- a/meta/packages/dbus/dbus-1.0.1/dbus-1.init +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | #! /bin/sh | ||
2 | # -*- coding: utf-8 -*- | ||
3 | # Debian init.d script for D-BUS | ||
4 | # Copyright © 2003 Colin Walters <walters@debian.org> | ||
5 | |||
6 | set -e | ||
7 | |||
8 | DAEMON=/usr/bin/dbus-daemon | ||
9 | NAME=dbus | ||
10 | DAEMONUSER=messagebus | ||
11 | PIDDIR=/var/run/dbus | ||
12 | PIDFILE=$PIDDIR/pid | ||
13 | UUIDDIR=/var/lib/dbus | ||
14 | DESC="system message bus" | ||
15 | EVENTDIR=/etc/dbus-1/event.d | ||
16 | |||
17 | test -x $DAEMON || exit 0 | ||
18 | |||
19 | # Source defaults file; edit that file to configure this script. | ||
20 | ENABLED=1 | ||
21 | PARAMS="" | ||
22 | if [ -e /etc/default/dbus ]; then | ||
23 | . /etc/default/dbus | ||
24 | fi | ||
25 | |||
26 | test "$ENABLED" != "0" || exit 0 | ||
27 | |||
28 | start_it_up() | ||
29 | { | ||
30 | if [ ! -d $PIDDIR ]; then | ||
31 | mkdir -p $PIDDIR | ||
32 | chown $DAEMONUSER $PIDDIR | ||
33 | chgrp $DAEMONUSER $PIDDIR | ||
34 | fi | ||
35 | if [ -e $PIDFILE ]; then | ||
36 | PIDDIR=/proc/$(cat $PIDFILE) | ||
37 | if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then | ||
38 | echo "$DESC already started; not starting." | ||
39 | else | ||
40 | echo "Removing stale PID file $PIDFILE." | ||
41 | rm -f $PIDFILE | ||
42 | fi | ||
43 | fi | ||
44 | |||
45 | if [ ! -d $UUIDDIR ]; then | ||
46 | mkdir -p $UUIDDIR | ||
47 | chown $DAEMONUSER $UUIDDIR | ||
48 | chgrp $DAEMONUSER $UUIDDIR | ||
49 | fi | ||
50 | |||
51 | dbus-uuidgen --ensure | ||
52 | |||
53 | echo -n "Starting $DESC: " | ||
54 | start-stop-daemon --start --quiet --pidfile $PIDFILE \ | ||
55 | --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS | ||
56 | echo "$NAME." | ||
57 | if [ -d $EVENTDIR ]; then | ||
58 | run-parts --arg=start $EVENTDIR | ||
59 | fi | ||
60 | } | ||
61 | |||
62 | shut_it_down() | ||
63 | { | ||
64 | if [ -d $EVENTDIR ]; then | ||
65 | run-parts --reverse --arg=stop $EVENTDIR | ||
66 | fi | ||
67 | echo -n "Stopping $DESC: " | ||
68 | start-stop-daemon --stop --quiet --pidfile $PIDFILE \ | ||
69 | --user $DAEMONUSER | ||
70 | # We no longer include these arguments so that start-stop-daemon | ||
71 | # can do its job even given that we may have been upgraded. | ||
72 | # We rely on the pidfile being sanely managed | ||
73 | # --exec $DAEMON -- --system $PARAMS | ||
74 | echo "$NAME." | ||
75 | rm -f $PIDFILE | ||
76 | } | ||
77 | |||
78 | case "$1" in | ||
79 | start) | ||
80 | start_it_up | ||
81 | ;; | ||
82 | stop) | ||
83 | shut_it_down | ||
84 | ;; | ||
85 | restart|force-reload) | ||
86 | shut_it_down | ||
87 | sleep 1 | ||
88 | start_it_up | ||
89 | ;; | ||
90 | *) | ||
91 | echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 | ||
92 | exit 1 | ||
93 | ;; | ||
94 | esac | ||
95 | |||
96 | exit 0 | ||
diff --git a/meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch deleted file mode 100644 index c31786357d..0000000000 --- a/meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: dbus-0.94/bus/Makefile.am | ||
2 | =================================================================== | ||
3 | --- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 | ||
4 | +++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 | ||
5 | @@ -110,7 +110,7 @@ | ||
6 | $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ | ||
7 | chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ | ||
8 | fi | ||
9 | - $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) | ||
10 | + $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) | ||
11 | $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus | ||
12 | $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d | ||
13 | $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services | ||