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 | openembedded-core-9f594e2d33d807b27e4bfbc00a0624d67f129169.tar.gz openembedded-core-9f594e2d33d807b27e4bfbc00a0624d67f129169.tar.bz2 openembedded-core-9f594e2d33d807b27e4bfbc00a0624d67f129169.tar.xz openembedded-core-9f594e2d33d807b27e4bfbc00a0624d67f129169.zip |
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 268a3ae3d..000000000 --- a/meta/packages/dbus/dbus-1.0.1/cross.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100 -+++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100 -@@ -719,6 +719,7 @@ - exit (0); - ]])], - [ac_cv_have_abstract_sockets=yes], -+ [ac_cv_have_abstract_sockets=no], - [ac_cv_have_abstract_sockets=no] - )]) - 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 38e7574ad..000000000 --- a/meta/packages/dbus/dbus-1.0.1/dbus-1.init +++ /dev/null @@ -1,96 +0,0 @@ -#! /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 -DAEMONUSER=messagebus -PIDDIR=/var/run/dbus -PIDFILE=$PIDDIR/pid -UUIDDIR=/var/lib/dbus -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 ]; then - . /etc/default/dbus -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 - - if [ ! -d $UUIDDIR ]; then - mkdir -p $UUIDDIR - chown $DAEMONUSER $UUIDDIR - chgrp $DAEMONUSER $UUIDDIR - fi - - dbus-uuidgen --ensure - - 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/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 c31786357..000000000 --- a/meta/packages/dbus/dbus-1.0.1/fix-install-daemon.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: dbus-0.94/bus/Makefile.am -=================================================================== ---- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 -+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 -@@ -110,7 +110,7 @@ - $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ - chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ - fi -- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) -+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus - $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services |