diff options
author | Ross Burton <ross@openedhand.com> | 2006-03-21 11:44:49 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2006-03-21 11:44:49 +0000 |
commit | 91a8ba408311676727b3b6060325a99e8edd165a (patch) | |
tree | 9bb0fa1a78c7b23211278ef08f00dcb12dc1036e /openembedded | |
parent | 884f57015c0d993a0568a9ea493a25dd1a3ff7ca (diff) | |
download | poky-91a8ba408311676727b3b6060325a99e8edd165a.tar.gz |
Remove DBus 0.50
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@313 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-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 | ||||
-rw-r--r-- | openembedded/packages/dbus/dbus_0.50.bb | 14 | ||||
-rw-r--r-- | openembedded/packages/dbus/dbus_0.50.inc | 65 |
5 files changed, 0 insertions, 191 deletions
diff --git a/openembedded/packages/dbus/dbus-0.50/dbus-1.init b/openembedded/packages/dbus/dbus-0.50/dbus-1.init deleted file mode 100644 index 60440b7223..0000000000 --- a/openembedded/packages/dbus/dbus-0.50/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 | |||
6 | set -e | ||
7 | |||
8 | DAEMON=/usr/bin/dbus-daemon | ||
9 | NAME=dbus-1 | ||
10 | DAEMONUSER=messagebus | ||
11 | PIDDIR=/var/run/dbus | ||
12 | PIDFILE=$PIDDIR/pid | ||
13 | DESC="system message bus" | ||
14 | EVENTDIR=/etc/dbus-1/event.d | ||
15 | |||
16 | test -x $DAEMON || exit 0 | ||
17 | |||
18 | # Source defaults file; edit that file to configure this script. | ||
19 | ENABLED=1 | ||
20 | PARAMS="" | ||
21 | if [ -e /etc/default/dbus-1 ]; then | ||
22 | . /etc/default/dbus-1 | ||
23 | fi | ||
24 | |||
25 | test "$ENABLED" != "0" || exit 0 | ||
26 | |||
27 | start_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 | |||
52 | shut_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 | |||
68 | case "$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 | ;; | ||
84 | esac | ||
85 | |||
86 | exit 0 | ||
diff --git a/openembedded/packages/dbus/dbus-0.50/no-bindings.patch b/openembedded/packages/dbus/dbus-0.50/no-bindings.patch deleted file mode 100644 index ccfc3f88b2..0000000000 --- a/openembedded/packages/dbus/dbus-0.50/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/openembedded/packages/dbus/dbus-0.50/no-introspect.patch b/openembedded/packages/dbus/dbus-0.50/no-introspect.patch deleted file mode 100644 index 1e43dd121b..0000000000 --- a/openembedded/packages/dbus/dbus-0.50/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/openembedded/packages/dbus/dbus_0.50.bb b/openembedded/packages/dbus/dbus_0.50.bb deleted file mode 100644 index a1d19897cc..0000000000 --- a/openembedded/packages/dbus/dbus_0.50.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | include dbus_${PV}.inc | ||
2 | |||
3 | |||
4 | DEPENDS = "expat glib-2.0 virtual/libintl dbus-native" | ||
5 | DEFAULT_PREFERENCE = "-1" | ||
6 | SRC_URI_EXTRA = "file://no-introspect.patch;patch=1 file://no-bindings.patch;patch=1" | ||
7 | |||
8 | FILES_${PN} += "${bindir}/dbus-daemon" | ||
9 | FILES_${PN}-dev += "${bindir}/dbus-binding-tool" | ||
10 | |||
11 | do_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/openembedded/packages/dbus/dbus_0.50.inc b/openembedded/packages/dbus/dbus_0.50.inc deleted file mode 100644 index 094a9b68d6..0000000000 --- a/openembedded/packages/dbus/dbus_0.50.inc +++ /dev/null | |||
@@ -1,65 +0,0 @@ | |||
1 | SECTION = "base" | ||
2 | PR = "r0" | ||
3 | HOMEPAGE = "http://www.freedesktop.org/Software/dbus" | ||
4 | DESCRIPTION = "message bus system for applications to talk to one another" | ||
5 | LICENSE = "GPL" | ||
6 | DEPENDS = "expat glib-2.0 virtual/libintl" | ||
7 | DEFAULT_PREFERENCE = "-1" | ||
8 | |||
9 | SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ | ||
10 | file://cross.patch;patch=1 \ | ||
11 | file://tmpdir.patch;patch=1 \ | ||
12 | file://dbus-1.init \ | ||
13 | file://no-examples.patch;patch=1 \ | ||
14 | ${SRC_URI_EXTRA}" | ||
15 | |||
16 | inherit autotools pkgconfig update-rc.d gettext | ||
17 | |||
18 | INITSCRIPT_NAME = "dbus-1" | ||
19 | INITSCRIPT_PARAMS = "defaults" | ||
20 | |||
21 | CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" | ||
22 | |||
23 | FILES_${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.*" | ||
24 | FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" | ||
25 | |||
26 | pkg_postinst_dbus() { | ||
27 | #!/bin/sh | ||
28 | |||
29 | # can't do adduser stuff offline | ||
30 | if [ "x$D" != "x" ]; then | ||
31 | exit 1 | ||
32 | fi | ||
33 | |||
34 | MESSAGEUSER=messagebus | ||
35 | MESSAGEHOME=/var/run/dbus | ||
36 | |||
37 | mkdir -p $MESSAGEHOME || true | ||
38 | chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" | ||
39 | chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" | ||
40 | } | ||
41 | |||
42 | EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \ | ||
43 | --disable-checks --disable-xml-docs --disable-doxygen-docs \ | ||
44 | --with-xml=expat --without-x" | ||
45 | |||
46 | |||
47 | do_stage () { | ||
48 | oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} | ||
49 | oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR} | ||
50 | |||
51 | autotools_stage_includes | ||
52 | |||
53 | mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ | ||
54 | install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ | ||
55 | } | ||
56 | |||
57 | do_install_append () { | ||
58 | install -d ${D}${sysconfdir}/init.d | ||
59 | install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 | ||
60 | } | ||
61 | |||
62 | python populate_packages_prepend () { | ||
63 | if (bb.data.getVar('DEBIAN_NAMES', d, 1)): | ||
64 | bb.data.setVar('PKG_dbus', 'dbus-1', d) | ||
65 | } | ||