summaryrefslogtreecommitdiff
path: root/meta/packages/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/dbus')
-rw-r--r--meta/packages/dbus/dbus-1.2.14/99_dbus1
-rw-r--r--meta/packages/dbus/dbus-1.2.14/cross.patch10
-rw-r--r--meta/packages/dbus/dbus-1.2.14/dbus-1.init121
-rw-r--r--meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch13
-rw-r--r--meta/packages/dbus/dbus-1.2.14/tmpdir.patch30
-rw-r--r--meta/packages/dbus/dbus-1.2.4/99_dbus1
-rw-r--r--meta/packages/dbus/dbus-1.2.4/cross.patch10
-rw-r--r--meta/packages/dbus/dbus-1.2.4/dbus-1.init121
-rw-r--r--meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch13
-rw-r--r--meta/packages/dbus/dbus-1.2.4/tmpdir.patch30
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch13
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch19
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/no-examples.patch8
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch24
-rw-r--r--meta/packages/dbus/dbus-glib-native_0.78.bb14
-rw-r--r--meta/packages/dbus/dbus-glib.inc18
-rw-r--r--meta/packages/dbus/dbus-glib_0.78.bb9
-rw-r--r--meta/packages/dbus/dbus-native_1.2.14.bb24
-rw-r--r--meta/packages/dbus/dbus-native_1.2.4.bb24
-rw-r--r--meta/packages/dbus/dbus.inc93
-rw-r--r--meta/packages/dbus/dbus_1.2.14.bb7
-rw-r--r--meta/packages/dbus/dbus_1.2.4.bb7
22 files changed, 0 insertions, 610 deletions
diff --git a/meta/packages/dbus/dbus-1.2.14/99_dbus b/meta/packages/dbus/dbus-1.2.14/99_dbus
deleted file mode 100644
index 6821ae4db..000000000
--- a/meta/packages/dbus/dbus-1.2.14/99_dbus
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 268a3ae3d..000000000
--- a/meta/packages/dbus/dbus-1.2.14/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.2.14/dbus-1.init b/meta/packages/dbus/dbus-1.2.14/dbus-1.init
deleted file mode 100644
index 4abc4cbf7..000000000
--- a/meta/packages/dbus/dbus-1.2.14/dbus-1.init
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /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
deleted file mode 100644
index c31786357..000000000
--- a/meta/packages/dbus/dbus-1.2.14/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
diff --git a/meta/packages/dbus/dbus-1.2.14/tmpdir.patch b/meta/packages/dbus/dbus-1.2.14/tmpdir.patch
deleted file mode 100644
index 838b903f0..000000000
--- a/meta/packages/dbus/dbus-1.2.14/tmpdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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-1.2.4/99_dbus b/meta/packages/dbus/dbus-1.2.4/99_dbus
deleted file mode 100644
index 6821ae4db..000000000
--- a/meta/packages/dbus/dbus-1.2.4/99_dbus
+++ /dev/null
@@ -1 +0,0 @@
-d messagebus messagebus 0755 /var/run/dbus none
diff --git a/meta/packages/dbus/dbus-1.2.4/cross.patch b/meta/packages/dbus/dbus-1.2.4/cross.patch
deleted file mode 100644
index 268a3ae3d..000000000
--- a/meta/packages/dbus/dbus-1.2.4/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.2.4/dbus-1.init b/meta/packages/dbus/dbus-1.2.4/dbus-1.init
deleted file mode 100644
index 4abc4cbf7..000000000
--- a/meta/packages/dbus/dbus-1.2.4/dbus-1.init
+++ /dev/null
@@ -1,121 +0,0 @@
-#! /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.4/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch
deleted file mode 100644
index c31786357..000000000
--- a/meta/packages/dbus/dbus-1.2.4/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
diff --git a/meta/packages/dbus/dbus-1.2.4/tmpdir.patch b/meta/packages/dbus/dbus-1.2.4/tmpdir.patch
deleted file mode 100644
index 838b903f0..000000000
--- a/meta/packages/dbus/dbus-1.2.4/tmpdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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-glib-0.78/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
deleted file mode 100644
index a0aaec372..000000000
--- a/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dbus-glib-0.78/dbus/Makefile.am
-===================================================================
---- dbus-glib-0.78.orig/dbus/Makefile.am 2009-01-15 15:14:29.000000000 +0000
-+++ dbus-glib-0.78/dbus/Makefile.am 2009-01-15 15:14:46.000000000 +0000
-@@ -104,7 +104,7 @@
-
- dbus_bash_completion_helper_SOURCES = \
- dbus-bash-completion-helper.c
--dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la
-+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la libdbus-glib-1.la -lexpat
-
-
- EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
diff --git a/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
deleted file mode 100644
index 1bdac5a39..000000000
--- a/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Use the dbus-binding-tool from PATH, not the generated one.
-
-RP - 12/1/09
-
-Index: dbus-glib-0.76/tools/Makefile.am
-===================================================================
---- dbus-glib-0.76.orig/tools/Makefile.am 2009-01-12 10:11:02.000000000 +0000
-+++ dbus-glib-0.76/tools/Makefile.am 2009-01-12 10:12:01.000000000 +0000
-@@ -3,8 +3,8 @@
- 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)/dbus/dbus-binding-tool$(EXEEXT)
-- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
-+dbus-glib-bindings.h: dbus-bus-introspect.xml
-+ dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
-
- BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
-
diff --git a/meta/packages/dbus/dbus-glib-0.78/no-examples.patch b/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
deleted file mode 100644
index 483153db7..000000000
--- a/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
-+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = . examples
-+SUBDIRS = .
-
- INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-
diff --git a/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
deleted file mode 100644
index a04f404f7..000000000
--- a/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
-===================================================================
---- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100
-+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100
-@@ -30,17 +30,15 @@
- echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
-
- ## create a configuration file based on the standard session.conf
--cat $DBUS_TOP_SRCDIR/tools/session.conf | \
-+cat $datadir/tools/session.conf | \
- sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
- sed -e 's/<include.*$//g' \
- > $CONFIG_FILE
-
- echo "Created configuration file $CONFIG_FILE" >&2
-
--PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
--export PATH
- ## the libtool script found by the path search should already do this, but
--LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
-+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
- export PATH
- unset DBUS_SESSION_BUS_ADDRESS
- unset DBUS_SESSION_BUS_PID
diff --git a/meta/packages/dbus/dbus-glib-native_0.78.bb b/meta/packages/dbus/dbus-glib-native_0.78.bb
deleted file mode 100644
index 81be0e123..000000000
--- a/meta/packages/dbus/dbus-glib-native_0.78.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require dbus-glib.inc
-inherit native
-
-DEPENDS = "glib-2.0-native dbus-native"
-
-PR = "r0"
-
-SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1"
-
-do_stage() {
- autotools_stage_all
- install -d ${STAGING_DATADIR}/dbus
- install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
-}
diff --git a/meta/packages/dbus/dbus-glib.inc b/meta/packages/dbus/dbus-glib.inc
deleted file mode 100644
index 7d811f912..000000000
--- a/meta/packages/dbus/dbus-glib.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "base"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
- file://fix_asneeded.patch;patch=1 \
- file://no-examples.patch;patch=1"
-
-inherit autotools_stage pkgconfig gettext
-
-EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
-
diff --git a/meta/packages/dbus/dbus-glib_0.78.bb b/meta/packages/dbus/dbus-glib_0.78.bb
deleted file mode 100644
index f7a176055..000000000
--- a/meta/packages/dbus/dbus-glib_0.78.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require dbus-glib.inc
-
-PR = "r0"
-
-do_configure_prepend() {
- cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
-}
-
-SRC_URI += "file://native-binding-tool.patch;patch=1"
diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb
deleted file mode 100644
index d799ba2d1..000000000
--- a/meta/packages/dbus/dbus-native_1.2.14.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-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-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
deleted file mode 100644
index d799ba2d1..000000000
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-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.inc b/meta/packages/dbus/dbus.inc
deleted file mode 100644
index 2efcf46b2..000000000
--- a/meta/packages/dbus/dbus.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-DESCRIPTION = "Message bus system for applications to talk to one another"
-HOMEPAGE = "http://dbus.freedesktop.org"
-SECTION = "base"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11 libsm"
-
-SRC_URI = "\
- http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
- file://cross.patch;patch=1 \
- file://tmpdir.patch;patch=1 \
- file://dbus-1.init \
- file://99_dbus \
-"
-
-inherit autotools pkgconfig gettext
-
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "start 02 5 2 . stop 20 0 1 6 ."
-
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
-
-DEBIANNAME_${PN} = "dbus-1"
-
-PACKAGES =+ "${PN}-lib"
-
-FILES_${PN} = "\
-${bindir}/dbus-daemon* \
-${bindir}/dbus-uuidgen \
-${bindir}/dbus-launch \
-${bindir}/dbus-cleanup-sockets \
-${bindir}/dbus-send \
-${bindir}/dbus-monitor \
-${libexecdir}/dbus* \
-${sysconfdir} \
-${datadir}/dbus-1/services \
-${datadir}/dbus-1/system-services \
-"
-FILES_${PN}-lib = "${libdir}/lib*.so.*"
-RRECOMMENDS_${PN}-lib = "${PN}"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/"
-
-pkg_postinst_dbus() {
-#!/bin/sh
-
-# can't do adduser stuff offline
-if [ "x$D" != "x" ]; then
- exit 1
-fi
-
-MESSAGEUSER=messagebus
-MESSAGEHOME=/var/run/dbus
-
-mkdir -p $MESSAGEHOME || true
-chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-
-grep -q netdev: /etc/group || addgroup netdev
-chmod u+s /usr/libexec/dbus-daemon-launch-helper
-}
-
-EXTRA_OECONF = "\
- --disable-qt \
- --disable-qt3 \
- --disable-gtk \
- --disable-tests \
- --disable-checks \
- --disable-xml-docs \
- --disable-doxygen-docs \
- --with-xml=expat \
- --with-x \
-"
-
-do_stage() {
- oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
-
- autotools_stage_includes
-
- mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
- install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-}
-
-do_install() {
- autotools_do_install
- install -d ${D}/etc/default/volatiles
- install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/
-
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
- # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
- if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
- install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
- fi
-}
diff --git a/meta/packages/dbus/dbus_1.2.14.bb b/meta/packages/dbus/dbus_1.2.14.bb
deleted file mode 100644
index b170e7b34..000000000
--- a/meta/packages/dbus/dbus_1.2.14.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include dbus.inc
-
-PR = "r1"
-
-inherit update-rc.d
-
-SRC_URI += "file://fix-install-daemon.patch;patch=1 "
diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
deleted file mode 100644
index b170e7b34..000000000
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-include dbus.inc
-
-PR = "r1"
-
-inherit update-rc.d
-
-SRC_URI += "file://fix-install-daemon.patch;patch=1 "