diff options
| -rw-r--r-- | meta/packages/dbus/dbus-1.2.14/99_dbus | 1 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus-1.2.14/cross.patch | 10 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus-1.2.14/dbus-1.init | 121 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch | 13 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus-1.2.14/tmpdir.patch | 30 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus-native_1.2.14.bb | 24 | ||||
| -rw-r--r-- | meta/packages/dbus/dbus_1.2.14.bb | 7 |
7 files changed, 206 insertions, 0 deletions
diff --git a/meta/packages/dbus/dbus-1.2.14/99_dbus b/meta/packages/dbus/dbus-1.2.14/99_dbus new file mode 100644 index 0000000000..6821ae4dba --- /dev/null +++ b/meta/packages/dbus/dbus-1.2.14/99_dbus @@ -0,0 +1 @@ +d messagebus messagebus 0755 /var/run/dbus none diff --git a/meta/packages/dbus/dbus-1.2.14/cross.patch b/meta/packages/dbus/dbus-1.2.14/cross.patch new file mode 100644 index 0000000000..268a3ae3de --- /dev/null +++ b/meta/packages/dbus/dbus-1.2.14/cross.patch @@ -0,0 +1,10 @@ +--- /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.2.14/dbus-1.init b/meta/packages/dbus/dbus-1.2.14/dbus-1.init new file mode 100644 index 0000000000..4abc4cbf73 --- /dev/null +++ b/meta/packages/dbus/dbus-1.2.14/dbus-1.init @@ -0,0 +1,121 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: dbus +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: D-Bus systemwide message bus +# Description: D-Bus is a simple interprocess messaging system, used +# for sending messages between applications. +### END INIT INFO +# +# -*- 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 + # TODO: --reverse when busybox supports it + run-parts --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 +} + +reload_it() +{ + echo -n "Reloading $DESC config: " + dbus-send --print-reply --system --type=method_call \ + --dest=org.freedesktop.DBus \ + / org.freedesktop.DBus.ReloadConfig > /dev/null + # hopefully this is enough time for dbus to reload it's config file. + echo "done." +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + reload|force-reload) + reload_it + ;; + restart) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch new file mode 100644 index 0000000000..c31786357d --- /dev/null +++ b/meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch @@ -0,0 +1,13 @@ +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 diff --git a/meta/packages/dbus/dbus-1.2.14/tmpdir.patch b/meta/packages/dbus/dbus-1.2.14/tmpdir.patch new file mode 100644 index 0000000000..838b903f0a --- /dev/null +++ b/meta/packages/dbus/dbus-1.2.14/tmpdir.patch @@ -0,0 +1,30 @@ +--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200 ++++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100 +@@ -1047,15 +1048,18 @@ + AC_SUBST(ABSOLUTE_TOP_BUILDDIR) + + #### Find socket directories +-if ! test -z "$TMPDIR" ; then +- DEFAULT_SOCKET_DIR=$TMPDIR +-elif ! test -z "$TEMP" ; then +- DEFAULT_SOCKET_DIR=$TEMP +-elif ! test -z "$TMP" ; then +- DEFAULT_SOCKET_DIR=$TMP +-else +- DEFAULT_SOCKET_DIR=/tmp +-fi ++#if ! test -z "$TMPDIR" ; then ++# DEFAULT_SOCKET_DIR=$TMPDIR ++#elif ! test -z "$TEMP" ; then ++# DEFAULT_SOCKET_DIR=$TEMP ++#elif ! test -z "$TMP" ; then ++# DEFAULT_SOCKET_DIR=$TMP ++#else ++# DEFAULT_SOCKET_DIR=/tmp ++#fi ++ ++# checks disabled to avoid expanding this at build time ++DEFAULT_SOCKET_DIR=/tmp + + if ! test -z "$with_test_socket_dir" ; then + TEST_SOCKET_DIR="$with_test_socket_dir" diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb new file mode 100644 index 0000000000..d799ba2d1d --- /dev/null +++ b/meta/packages/dbus/dbus-native_1.2.14.bb @@ -0,0 +1,24 @@ +require dbus.inc +inherit native + +DEPENDS = "glib-2.0-native libxml2-native expat-native" + +PR = "r3" + +do_stage() { + oe_runmake install + autotools_stage_all + + # for dbus-glib-native introspection generation + install -d ${STAGING_DATADIR}/dbus + install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf + + # dbus-glib-native and dbus-glib need this xml file + install -d ${STAGING_DATADIR_NATIVE}/dbus/ + cd ${S} + ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml +} + +do_install() { + : +} diff --git a/meta/packages/dbus/dbus_1.2.14.bb b/meta/packages/dbus/dbus_1.2.14.bb new file mode 100644 index 0000000000..b170e7b340 --- /dev/null +++ b/meta/packages/dbus/dbus_1.2.14.bb @@ -0,0 +1,7 @@ +include dbus.inc + +PR = "r1" + +inherit update-rc.d + +SRC_URI += "file://fix-install-daemon.patch;patch=1 " |