summaryrefslogtreecommitdiffstats
path: root/meta/packages/dbus
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-03-28 11:39:21 +0000
committerRichard Purdie <richard@openedhand.com>2007-03-28 11:39:21 +0000
commit4d8f28d71677776f5d61c19f62ab927ee8501739 (patch)
tree1f6ec8fc8207ad66cf1cb192beeb3756cf783e79 /meta/packages/dbus
parent030fa712c3b6debf16af2ab59568704d2dc6af4d (diff)
downloadpoky-4d8f28d71677776f5d61c19f62ab927ee8501739.tar.gz
dbus: Drop 0.60
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1402 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/dbus')
-rw-r--r--meta/packages/dbus/dbus-0.60/dbus-1.init86
-rw-r--r--meta/packages/dbus/dbus-0.60/no-bindings.patch12
-rw-r--r--meta/packages/dbus/dbus-0.60/no-introspect.patch14
-rw-r--r--meta/packages/dbus/dbus-native_0.60.bb20
-rw-r--r--meta/packages/dbus/dbus_0.60.bb14
-rw-r--r--meta/packages/dbus/dbus_0.60.inc64
6 files changed, 0 insertions, 210 deletions
diff --git a/meta/packages/dbus/dbus-0.60/dbus-1.init b/meta/packages/dbus/dbus-0.60/dbus-1.init
deleted file mode 100644
index 60440b7223..0000000000
--- a/meta/packages/dbus/dbus-0.60/dbus-1.init
+++ /dev/null
@@ -1,86 +0,0 @@
1#! /bin/sh
2# -*- coding: utf-8 -*-
3# Debian init.d script for D-BUS
4# Copyright © 2003 Colin Walters <walters@debian.org>
5
6set -e
7
8DAEMON=/usr/bin/dbus-daemon
9NAME=dbus-1
10DAEMONUSER=messagebus
11PIDDIR=/var/run/dbus
12PIDFILE=$PIDDIR/pid
13DESC="system message bus"
14EVENTDIR=/etc/dbus-1/event.d
15
16test -x $DAEMON || exit 0
17
18# Source defaults file; edit that file to configure this script.
19ENABLED=1
20PARAMS=""
21if [ -e /etc/default/dbus-1 ]; then
22 . /etc/default/dbus-1
23fi
24
25test "$ENABLED" != "0" || exit 0
26
27start_it_up()
28{
29 if [ ! -d $PIDDIR ]; then
30 mkdir -p $PIDDIR
31 chown $DAEMONUSER $PIDDIR
32 chgrp $DAEMONUSER $PIDDIR
33 fi
34 if [ -e $PIDFILE ]; then
35 PIDDIR=/proc/$(cat $PIDFILE)
36 if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
37 echo "$DESC already started; not starting."
38 else
39 echo "Removing stale PID file $PIDFILE."
40 rm -f $PIDFILE
41 fi
42 fi
43 echo -n "Starting $DESC: "
44 start-stop-daemon --start --quiet --pidfile $PIDFILE \
45 --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
46 echo "$NAME."
47 if [ -d $EVENTDIR ]; then
48 run-parts --arg=start $EVENTDIR
49 fi
50}
51
52shut_it_down()
53{
54 if [ -d $EVENTDIR ]; then
55 run-parts --reverse --arg=stop $EVENTDIR
56 fi
57 echo -n "Stopping $DESC: "
58 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
59 --user $DAEMONUSER
60 # We no longer include these arguments so that start-stop-daemon
61 # can do its job even given that we may have been upgraded.
62 # We rely on the pidfile being sanely managed
63 # --exec $DAEMON -- --system $PARAMS
64 echo "$NAME."
65 rm -f $PIDFILE
66}
67
68case "$1" in
69 start)
70 start_it_up
71 ;;
72 stop)
73 shut_it_down
74 ;;
75 restart|force-reload)
76 shut_it_down
77 sleep 1
78 start_it_up
79 ;;
80 *)
81 echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
82 exit 1
83 ;;
84esac
85
86exit 0
diff --git a/meta/packages/dbus/dbus-0.60/no-bindings.patch b/meta/packages/dbus/dbus-0.60/no-bindings.patch
deleted file mode 100644
index ccfc3f88b2..0000000000
--- a/meta/packages/dbus/dbus-0.60/no-bindings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:05:38 +0200
2+++ dbus-0.50/tools/Makefile.am 2005-09-07 10:06:30 +0200
3@@ -6,9 +6,6 @@
4 nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
5 libdbus_glibdir = $(includedir)/dbus-1.0/dbus
6
7-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/glib/dbus-binding-tool$(EXEEXT)
8- $(top_builddir)/glib/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
9-
10 BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
11
12 else
diff --git a/meta/packages/dbus/dbus-0.60/no-introspect.patch b/meta/packages/dbus/dbus-0.60/no-introspect.patch
deleted file mode 100644
index 1e43dd121b..0000000000
--- a/meta/packages/dbus/dbus-0.60/no-introspect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1--- dbus-0.50/tools/Makefile.am.orig 2005-09-07 10:03:49 +0200
2+++ dbus-0.50/tools/Makefile.am 2005-09-07 10:04:28 +0200
3@@ -21,11 +21,6 @@
4 GTK_TOOLS=
5 endif
6
7-if HAVE_GLIB
8-dbus-bus-introspect.xml: $(top_builddir)/bus/dbus-daemon$(EXEEXT) dbus-launch$(EXEEXT) dbus-send$(EXEEXT) $(top_builddir)/bus/dbus-daemon$(EXEEXT) Makefile
9- 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
10-endif
11-
12 bin_PROGRAMS=dbus-send $(GLIB_TOOLS) dbus-launch dbus-cleanup-sockets $(GTK_TOOLS)
13
14 dbus_send_SOURCES= \
diff --git a/meta/packages/dbus/dbus-native_0.60.bb b/meta/packages/dbus/dbus-native_0.60.bb
deleted file mode 100644
index 747fc73676..0000000000
--- a/meta/packages/dbus/dbus-native_0.60.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1require dbus_${PV}.inc
2
3SRC_URI_EXTRA=""
4
5inherit native
6
7S = "${WORKDIR}/dbus-${PV}"
8FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus"
9DEPENDS = "glib-2.0-native"
10PROVIDES = "dbus-glib-native"
11
12PR = "r1"
13
14do_stage() {
15 oe_runmake install
16 install -d ${STAGING_DATADIR}/dbus
17 install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
18 install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
19}
20
diff --git a/meta/packages/dbus/dbus_0.60.bb b/meta/packages/dbus/dbus_0.60.bb
deleted file mode 100644
index 57edc7f92f..0000000000
--- a/meta/packages/dbus/dbus_0.60.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require dbus_${PV}.inc
2
3
4DEPENDS = "expat glib-2.0 virtual/libintl dbus-native"
5SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1"
6PROVIDES = "dbus-glib"
7
8FILES_${PN} += "${bindir}/dbus-daemon"
9FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
10
11do_configure_prepend() {
12 install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
13 install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
14}
diff --git a/meta/packages/dbus/dbus_0.60.inc b/meta/packages/dbus/dbus_0.60.inc
deleted file mode 100644
index 70546ed5b1..0000000000
--- a/meta/packages/dbus/dbus_0.60.inc
+++ /dev/null
@@ -1,64 +0,0 @@
1SECTION = "base"
2PR = "r0"
3HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
4DESCRIPTION = "message bus system for applications to talk to one another"
5LICENSE = "GPL"
6DEPENDS = "expat glib-2.0 virtual/libintl"
7
8SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
9 file://cross.patch;patch=1 \
10 file://tmpdir.patch;patch=1 \
11 file://dbus-1.init \
12 file://no-examples.patch;patch=1 \
13 ${SRC_URI_EXTRA}"
14
15inherit autotools pkgconfig update-rc.d gettext
16
17INITSCRIPT_NAME = "dbus-1"
18INITSCRIPT_PARAMS = "defaults"
19
20CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
21
22FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
23FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
24
25pkg_postinst_dbus() {
26#!/bin/sh
27
28# can't do adduser stuff offline
29if [ "x$D" != "x" ]; then
30 exit 1
31fi
32
33MESSAGEUSER=messagebus
34MESSAGEHOME=/var/run/dbus
35
36mkdir -p $MESSAGEHOME || true
37chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
38chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
39}
40
41EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
42 --disable-checks --disable-xml-docs --disable-doxygen-docs \
43 --with-xml=expat --without-x"
44
45
46do_stage () {
47 oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
48 oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
49
50 autotools_stage_includes
51
52 mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
53 install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
54}
55
56do_install_append () {
57 install -d ${D}${sysconfdir}/init.d
58 install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
59}
60
61python populate_packages_prepend () {
62 if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
63 bb.data.setVar('PKG_dbus', 'dbus-1', d)
64}