summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-07 23:52:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-08 14:50:38 +0000
commitdecf46bd78748ccb8d35067809c801ea580a6a01 (patch)
treecb5d9064469a1e8b33370835b691a3f9270ec3a4 /meta/recipes-core
parenta38e4d91cf435d73997ddcb9cc41e934d3cef9a6 (diff)
downloadpoky-decf46bd78748ccb8d35067809c801ea580a6a01.tar.gz
dbus: Drop old 1.5.12 version
We have a newer default version... (From OE-Core rev: 1ffa1b1b23cbd7fbcfe95abc6c045eef93f96f2a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.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.5.12/dbus-1.init116
-rw-r--r--meta/recipes-core/dbus/dbus-1.5.12/tmpdir.patch44
-rw-r--r--meta/recipes-core/dbus/dbus_1.5.12.bb9
3 files changed, 0 insertions, 169 deletions
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
deleted file mode 100644
index 17b58ed18f..0000000000
--- a/meta/recipes-core/dbus/dbus-1.5.12/dbus-1.init
+++ /dev/null
@@ -1,116 +0,0 @@
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 # must match /etc/dbus-1/system.conf
22PIDFILE=/var/run/messagebus.pid # must match /etc/dbus-1/system.conf
23UUIDDIR=/var/lib/dbus
24DESC="system message bus"
25EVENTDIR=/etc/dbus-1/event.d
26
27test -x $DAEMON || exit 0
28
29# Source defaults file; edit that file to configure this script.
30ENABLED=1
31PARAMS=""
32if [ -e /etc/default/dbus ]; then
33 . /etc/default/dbus
34fi
35
36test "$ENABLED" != "0" || exit 0
37
38start_it_up()
39{
40 mkdir -p "`dirname $PIDFILE`"
41 if [ -e $PIDFILE ]; then
42 PIDDIR=/proc/$(cat $PIDFILE)
43 if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
44 echo "$DESC already started; not starting."
45 else
46 echo "Removing stale PID file $PIDFILE."
47 rm -f $PIDFILE
48 fi
49 fi
50
51 if [ ! -d $UUIDDIR ]; then
52 mkdir -p $UUIDDIR
53 chown $DAEMONUSER $UUIDDIR
54 chgrp $DAEMONUSER $UUIDDIR
55 fi
56
57 dbus-uuidgen --ensure
58
59 echo -n "Starting $DESC: "
60 start-stop-daemon --start --quiet --pidfile $PIDFILE \
61 --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
62 echo "$NAME."
63 if [ -d $EVENTDIR ]; then
64 run-parts --arg=start $EVENTDIR
65 fi
66}
67
68shut_it_down()
69{
70 if [ -d $EVENTDIR ]; then
71 # TODO: --reverse when busybox supports it
72 run-parts --arg=stop $EVENTDIR
73 fi
74 echo -n "Stopping $DESC: "
75 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
76 --user $DAEMONUSER
77 # We no longer include these arguments so that start-stop-daemon
78 # can do its job even given that we may have been upgraded.
79 # We rely on the pidfile being sanely managed
80 # --exec $DAEMON -- --system $PARAMS
81 echo "$NAME."
82 rm -f $PIDFILE
83}
84
85reload_it()
86{
87 echo -n "Reloading $DESC config: "
88 dbus-send --print-reply --system --type=method_call \
89 --dest=org.freedesktop.DBus \
90 / org.freedesktop.DBus.ReloadConfig > /dev/null
91 # hopefully this is enough time for dbus to reload it's config file.
92 echo "done."
93}
94
95case "$1" in
96 start)
97 start_it_up
98 ;;
99 stop)
100 shut_it_down
101 ;;
102 reload|force-reload)
103 reload_it
104 ;;
105 restart)
106 shut_it_down
107 sleep 1
108 start_it_up
109 ;;
110 *)
111 echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
112 exit 1
113 ;;
114esac
115
116exit 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
deleted file mode 100644
index bf086e1788..0000000000
--- a/meta/recipes-core/dbus/dbus-1.5.12/tmpdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
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.5.12.bb b/meta/recipes-core/dbus/dbus_1.5.12.bb
deleted file mode 100644
index f41d170621..0000000000
--- a/meta/recipes-core/dbus/dbus_1.5.12.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1include dbus.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI[md5sum] = "ddf18c86fd86ca0d766e18a514e368fd"
6SRC_URI[sha256sum] = "5d3e09a831259ca64b15357cfa1c60a5a7ab06ef469d5b82c2308de9cadf1094"
7
8DEFAULT_PREFERENCE = "-1"
9