diff options
author | Richard Purdie <richard@openedhand.com> | 2005-09-22 22:02:48 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-09-22 22:02:48 +0000 |
commit | 26a96fc12fb2df9e965087589da2ed6a3e39b5e4 (patch) | |
tree | aa162fa89439bae50782e2528b02ed2a407c3131 /openembedded/packages/dbus/dbus-0.50 | |
parent | d18457f094de8532eb8921991303032cdb345fe9 (diff) | |
download | openembedded-core-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.tar.gz openembedded-core-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.tar.bz2 openembedded-core-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.tar.xz openembedded-core-26a96fc12fb2df9e965087589da2ed6a3e39b5e4.zip |
Updates against mainline OE to fix various issues and make builds work again as a couple of poky changes got lost
git-svn-id: https://svn.o-hand.com/repos/poky@29 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/dbus/dbus-0.50')
-rw-r--r-- | openembedded/packages/dbus/dbus-0.50/dbus-1.init | 86 | ||||
-rw-r--r-- | openembedded/packages/dbus/dbus-0.50/no-bindings.patch | 12 | ||||
-rw-r--r-- | openembedded/packages/dbus/dbus-0.50/no-introspect.patch | 14 |
3 files changed, 112 insertions, 0 deletions
diff --git a/openembedded/packages/dbus/dbus-0.50/dbus-1.init b/openembedded/packages/dbus/dbus-0.50/dbus-1.init new file mode 100644 index 000000000..60440b722 --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.50/dbus-1.init @@ -0,0 +1,86 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters <walters@debian.org> + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus-1 +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus-1 ]; then + . /etc/default/dbus-1 +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + restart|force-reload) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/openembedded/packages/dbus/dbus-0.50/no-bindings.patch b/openembedded/packages/dbus/dbus-0.50/no-bindings.patch new file mode 100644 index 000000000..ccfc3f88b --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.50/no-bindings.patch @@ -0,0 +1,12 @@ +--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:05:38 +0200 ++++ dbus-0.50/tools/Makefile.am 2005-09-07 10:06:30 +0200 +@@ -6,9 +6,6 @@ + nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h + libdbus_glibdir = $(includedir)/dbus-1.0/dbus + +-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT) +- $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml +- + BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml + + else diff --git a/openembedded/packages/dbus/dbus-0.50/no-introspect.patch b/openembedded/packages/dbus/dbus-0.50/no-introspect.patch new file mode 100644 index 000000000..1e43dd121 --- /dev/null +++ b/openembedded/packages/dbus/dbus-0.50/no-introspect.patch @@ -0,0 +1,14 @@ +--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:03:49 +0200 ++++ dbus-0.50/tools/Makefile.am 2005-09-07 10:04:28 +0200 +@@ -21,11 +21,6 @@ + GTK_TOOLS= + endif + +-if HAVE_GLIB +-dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile +- DBUS_TOP_BUILDDIR=$(top_builddir) $(srcdir)/run-with-tmp-session-bus.sh ./dbus-send --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml +-endif +- + bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS) + + dbus_send_SOURCES= \ |