summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2012-05-31 12:17:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-05 23:04:59 +0100
commit7f713b64bfa1be8d41d1c8c8e18770c1f3ab8e74 (patch)
tree67748eeb928e83f3f08036f02a022251f0513bd8 /meta/recipes-core
parente618834b30d30b995a0daeeb4b54d3f6dedb6b24 (diff)
downloadpoky-7f713b64bfa1be8d41d1c8c8e18770c1f3ab8e74.tar.gz
dbus: update to version 1.4.20
Unstable version 1.5.12 also supported (From OE-Core rev: 1a5ae9b47c6294f1969a6a36f9ffddc39a707849) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init (renamed from meta/recipes-core/dbus/dbus-1.4.16/dbus-1.init)0
-rw-r--r--meta/recipes-core/dbus/dbus-1.4.20/tmpdir.patch (renamed from meta/recipes-core/dbus/dbus-1.4.16/tmpdir.patch)0
-rw-r--r--meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init121
-rw-r--r--meta/recipes-core/dbus/dbus-1.5.12/tmpdir.patch44
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.16.bb7
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.20.bb6
-rw-r--r--meta/recipes-core/dbus/dbus_1.5.12.bb9
7 files changed, 180 insertions, 7 deletions
diff --git a/meta/recipes-core/dbus/dbus-1.4.16/dbus-1.init b/meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init
index 4abc4cbf73..4abc4cbf73 100644
--- a/meta/recipes-core/dbus/dbus-1.4.16/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.4.20/dbus-1.init
diff --git a/meta/recipes-core/dbus/dbus-1.4.16/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.4.20/tmpdir.patch
index bf086e1788..bf086e1788 100644
--- a/meta/recipes-core/dbus/dbus-1.4.16/tmpdir.patch
+++ b/meta/recipes-core/dbus/dbus-1.4.20/tmpdir.patch
diff --git a/meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init b/meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init
new file mode 100644
index 0000000000..4abc4cbf73
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init
@@ -0,0 +1,121 @@
1#! /bin/sh
2### BEGIN INIT INFO
3# Provides: dbus
4# Required-Start: $remote_fs $syslog
5# Required-Stop: $remote_fs $syslog
6# Default-Start: 2 3 4 5
7# Default-Stop: 1
8# Short-Description: D-Bus systemwide message bus
9# Description: D-Bus is a simple interprocess messaging system, used
10# for sending messages between applications.
11### END INIT INFO
12#
13# -*- coding: utf-8 -*-
14# Debian init.d script for D-BUS
15# Copyright © 2003 Colin Walters <walters@debian.org>
16
17set -e
18
19DAEMON=/usr/bin/dbus-daemon
20NAME=dbus
21DAEMONUSER=messagebus
22PIDDIR=/var/run/dbus
23PIDFILE=$PIDDIR/pid
24UUIDDIR=/var/lib/dbus
25DESC="system message bus"
26EVENTDIR=/etc/dbus-1/event.d
27
28test -x $DAEMON || exit 0
29
30# Source defaults file; edit that file to configure this script.
31ENABLED=1
32PARAMS=""
33if [ -e /etc/default/dbus ]; then
34 . /etc/default/dbus
35fi
36
37test "$ENABLED" != "0" || exit 0
38
39start_it_up()
40{
41 if [ ! -d $PIDDIR ]; then
42 mkdir -p $PIDDIR
43 chown $DAEMONUSER $PIDDIR
44 chgrp $DAEMONUSER $PIDDIR
45 fi
46 if [ -e $PIDFILE ]; then
47 PIDDIR=/proc/$(cat $PIDFILE)
48 if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
49 echo "$DESC already started; not starting."
50 else
51 echo "Removing stale PID file $PIDFILE."
52 rm -f $PIDFILE
53 fi
54 fi
55
56 if [ ! -d $UUIDDIR ]; then
57 mkdir -p $UUIDDIR
58 chown $DAEMONUSER $UUIDDIR
59 chgrp $DAEMONUSER $UUIDDIR
60 fi
61
62 dbus-uuidgen --ensure
63
64 echo -n "Starting $DESC: "
65 start-stop-daemon --start --quiet --pidfile $PIDFILE \
66 --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
67 echo "$NAME."
68 if [ -d $EVENTDIR ]; then
69 run-parts --arg=start $EVENTDIR
70 fi
71}
72
73shut_it_down()
74{
75 if [ -d $EVENTDIR ]; then
76 # TODO: --reverse when busybox supports it
77 run-parts --arg=stop $EVENTDIR
78 fi
79 echo -n "Stopping $DESC: "
80 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
81 --user $DAEMONUSER
82 # We no longer include these arguments so that start-stop-daemon
83 # can do its job even given that we may have been upgraded.
84 # We rely on the pidfile being sanely managed
85 # --exec $DAEMON -- --system $PARAMS
86 echo "$NAME."
87 rm -f $PIDFILE
88}
89
90reload_it()
91{
92 echo -n "Reloading $DESC config: "
93 dbus-send --print-reply --system --type=method_call \
94 --dest=org.freedesktop.DBus \
95 / org.freedesktop.DBus.ReloadConfig > /dev/null
96 # hopefully this is enough time for dbus to reload it's config file.
97 echo "done."
98}
99
100case "$1" in
101 start)
102 start_it_up
103 ;;
104 stop)
105 shut_it_down
106 ;;
107 reload|force-reload)
108 reload_it
109 ;;
110 restart)
111 shut_it_down
112 sleep 1
113 start_it_up
114 ;;
115 *)
116 echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
117 exit 1
118 ;;
119esac
120
121exit 0
diff --git a/meta/recipes-core/dbus/dbus-1.5.12/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.5.12/tmpdir.patch
new file mode 100644
index 0000000000..bf086e1788
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.5.12/tmpdir.patch
@@ -0,0 +1,44 @@
1From 5105fedd7fa13dadd2d0d864fb77873b83b79a4b Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Thu, 23 Jun 2011 13:52:09 +0200
4Subject: [PATCH] buildsys: hardcode socketdir to /tmp
5
6the TMPDIR env var isn't always pointing to the right target path
7
8Upstream-Status: Inappropriate [embedded]
9
10Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
11
12Original comment:
13
14 avoid to check tmp dir at build time. instead uses hard coded /tmp here
15 comment added by Kevin Tian <kevin.tian@intel.com>
16---
17 configure.ac | 11 +----------
18 1 files changed, 1 insertions(+), 10 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 408054b..6d26180 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -1483,16 +1483,7 @@ AC_SUBST(TEST_LAUNCH_HELPER_BINARY)
25 AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY",
26 [Full path to the launch helper test program in the builddir])
27
28-#### Find socket directories
29-if ! test -z "$TMPDIR" ; then
30- DEFAULT_SOCKET_DIR=$TMPDIR
31-elif ! test -z "$TEMP" ; then
32- DEFAULT_SOCKET_DIR=$TEMP
33-elif ! test -z "$TMP" ; then
34- DEFAULT_SOCKET_DIR=$TMP
35-else
36- DEFAULT_SOCKET_DIR=/tmp
37-fi
38+DEFAULT_SOCKET_DIR=/tmp
39
40 DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'`
41
42--
431.6.6.1
44
diff --git a/meta/recipes-core/dbus/dbus_1.4.16.bb b/meta/recipes-core/dbus/dbus_1.4.16.bb
deleted file mode 100644
index 3cf8bb8d97..0000000000
--- a/meta/recipes-core/dbus/dbus_1.4.16.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1include dbus.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "44a2a10678e7e50460879c3eb4453a65"
6SRC_URI[sha256sum] = "1d8ee6262f8cc2148f06578eee522c755ba0896206b3464ca9bdc84f411b29c6"
7
diff --git a/meta/recipes-core/dbus/dbus_1.4.20.bb b/meta/recipes-core/dbus/dbus_1.4.20.bb
new file mode 100644
index 0000000000..c0da998dff
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus_1.4.20.bb
@@ -0,0 +1,6 @@
1include dbus.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "79eca2f2c1894ac347acce128314428b"
6SRC_URI[sha256sum] = "103bdcd261a13140730b5fa69f56a98ab5c89ba3f0116ea62fcfd639520d5aaf"
diff --git a/meta/recipes-core/dbus/dbus_1.5.12.bb b/meta/recipes-core/dbus/dbus_1.5.12.bb
new file mode 100644
index 0000000000..f41d170621
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus_1.5.12.bb
@@ -0,0 +1,9 @@
1include dbus.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "ddf18c86fd86ca0d766e18a514e368fd"
6SRC_URI[sha256sum] = "5d3e09a831259ca64b15357cfa1c60a5a7ab06ef469d5b82c2308de9cadf1094"
7
8DEFAULT_PREFERENCE = "-1"
9