summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-02 17:05:01 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-02 17:05:01 +0000
commit8fa334d02a80bc05c403fa944b59322b7fa52f07 (patch)
treefdf221f3454616aa298609737d5855b681fe23ed
parent23486c1532e7653a1b4ef405e28a014f0223fd11 (diff)
downloadpoky-8fa334d02a80bc05c403fa944b59322b7fa52f07.tar.gz
dbus: Drop old 1.0.* and 1.1.* versions
Diffstat
-rw-r--r--meta/packages/dbus/dbus-1.0.3/99_dbus1
-rw-r--r--meta/packages/dbus/dbus-1.0.3/cross.patch10
-rw-r--r--meta/packages/dbus/dbus-1.0.3/dbus-1.init110
-rw-r--r--meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch13
-rw-r--r--meta/packages/dbus/dbus-1.0.3/tmpdir.patch30
-rw-r--r--meta/packages/dbus/dbus-1.1.20/99_dbus1
-rw-r--r--meta/packages/dbus/dbus-1.1.20/cross.patch10
-rw-r--r--meta/packages/dbus/dbus-1.1.20/dbus-1.init121
-rw-r--r--meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch14
-rw-r--r--meta/packages/dbus/dbus-1.1.20/fix-install-daemon.patch13
-rw-r--r--meta/packages/dbus/dbus-1.1.20/tmpdir.patch30
-rw-r--r--meta/packages/dbus/dbus-native_1.0.3.bb28
-rw-r--r--meta/packages/dbus/dbus-native_1.1.20.bb20
-rw-r--r--meta/packages/dbus/dbus_1.0.3.bb4
-rw-r--r--meta/packages/dbus/dbus_1.1.20.bb6
15 files changed, 0 insertions, 411 deletions
diff --git a/meta/packages/dbus/dbus-1.0.3/99_dbus b/meta/packages/dbus/dbus-1.0.3/99_dbus
deleted file mode 100644
index 6821ae4dba..0000000000
--- a/meta/packages/dbus/dbus-1.0.3/99_dbus
+++ /dev/null
@@ -1 +0,0 @@
1d messagebus messagebus 0755 /var/run/dbus none
diff --git a/meta/packages/dbus/dbus-1.0.3/cross.patch b/meta/packages/dbus/dbus-1.0.3/cross.patch
deleted file mode 100644
index 268a3ae3de..0000000000
--- a/meta/packages/dbus/dbus-1.0.3/cross.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100
2+++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100
3@@ -719,6 +719,7 @@
4 exit (0);
5 ]])],
6 [ac_cv_have_abstract_sockets=yes],
7+ [ac_cv_have_abstract_sockets=no],
8 [ac_cv_have_abstract_sockets=no]
9 )])
10 AC_LANG_POP(C)
diff --git a/meta/packages/dbus/dbus-1.0.3/dbus-1.init b/meta/packages/dbus/dbus-1.0.3/dbus-1.init
deleted file mode 100644
index 0725083c69..0000000000
--- a/meta/packages/dbus/dbus-1.0.3/dbus-1.init
+++ /dev/null
@@ -1,110 +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
10DAEMONUSER=messagebus
11PIDDIR=/var/run/dbus
12PIDFILE=$PIDDIR/pid
13UUIDDIR=/var/lib/dbus
14DESC="system message bus"
15EVENTDIR=/etc/dbus-1/event.d
16
17test -x $DAEMON || exit 0
18
19# Source defaults file; edit that file to configure this script.
20ENABLED=1
21PARAMS=""
22if [ -e /etc/default/dbus ]; then
23 . /etc/default/dbus
24fi
25
26test "$ENABLED" != "0" || exit 0
27
28start_it_up()
29{
30 if [ ! -d $PIDDIR ]; then
31 mkdir -p $PIDDIR
32 chown $DAEMONUSER $PIDDIR
33 chgrp $DAEMONUSER $PIDDIR
34 fi
35 if [ -e $PIDFILE ]; then
36 PIDDIR=/proc/$(cat $PIDFILE)
37 if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
38 echo "$DESC already started; not starting."
39 else
40 echo "Removing stale PID file $PIDFILE."
41 rm -f $PIDFILE
42 fi
43 fi
44
45 if [ ! -d $UUIDDIR ]; then
46 mkdir -p $UUIDDIR
47 chown $DAEMONUSER $UUIDDIR
48 chgrp $DAEMONUSER $UUIDDIR
49 fi
50
51 dbus-uuidgen --ensure
52
53 echo -n "Starting $DESC: "
54 start-stop-daemon --start --quiet --pidfile $PIDFILE \
55 --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
56 echo "$NAME."
57 if [ -d $EVENTDIR ]; then
58 run-parts --arg=start $EVENTDIR
59 fi
60}
61
62shut_it_down()
63{
64 if [ -d $EVENTDIR ]; then
65 # TODO: --reverse when busybox supports it
66 run-parts --arg=stop $EVENTDIR
67 fi
68 echo -n "Stopping $DESC: "
69 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
70 --user $DAEMONUSER
71 # We no longer include these arguments so that start-stop-daemon
72 # can do its job even given that we may have been upgraded.
73 # We rely on the pidfile being sanely managed
74 # --exec $DAEMON -- --system $PARAMS
75 echo "$NAME."
76 rm -f $PIDFILE
77}
78
79reload_it()
80{
81 echo -n "Reloading $DESC config: "
82 dbus-send --print-reply --system --type=method_call \
83 --dest=org.freedesktop.DBus \
84 / org.freedesktop.DBus.ReloadConfig > /dev/null
85 # hopefully this is enough time for dbus to reload it's config file.
86 echo "done."
87}
88
89case "$1" in
90 start)
91 start_it_up
92 ;;
93 stop)
94 shut_it_down
95 ;;
96 reload|force-reload)
97 reload_it
98 ;;
99 restart)
100 shut_it_down
101 sleep 1
102 start_it_up
103 ;;
104 *)
105 echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
106 exit 1
107 ;;
108esac
109
110exit 0
diff --git a/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
deleted file mode 100644
index c31786357d..0000000000
--- a/meta/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: dbus-0.94/bus/Makefile.am
2===================================================================
3--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200
4+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200
5@@ -110,7 +110,7 @@
6 $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
7 chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
8 fi
9- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
10+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
11 $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
12 $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
13 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/meta/packages/dbus/dbus-1.0.3/tmpdir.patch b/meta/packages/dbus/dbus-1.0.3/tmpdir.patch
deleted file mode 100644
index 838b903f0a..0000000000
--- a/meta/packages/dbus/dbus-1.0.3/tmpdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
2+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
3@@ -1047,15 +1048,18 @@
4 AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
5
6 #### Find socket directories
7-if ! test -z "$TMPDIR" ; then
8- DEFAULT_SOCKET_DIR=$TMPDIR
9-elif ! test -z "$TEMP" ; then
10- DEFAULT_SOCKET_DIR=$TEMP
11-elif ! test -z "$TMP" ; then
12- DEFAULT_SOCKET_DIR=$TMP
13-else
14- DEFAULT_SOCKET_DIR=/tmp
15-fi
16+#if ! test -z "$TMPDIR" ; then
17+# DEFAULT_SOCKET_DIR=$TMPDIR
18+#elif ! test -z "$TEMP" ; then
19+# DEFAULT_SOCKET_DIR=$TEMP
20+#elif ! test -z "$TMP" ; then
21+# DEFAULT_SOCKET_DIR=$TMP
22+#else
23+# DEFAULT_SOCKET_DIR=/tmp
24+#fi
25+
26+# checks disabled to avoid expanding this at build time
27+DEFAULT_SOCKET_DIR=/tmp
28
29 if ! test -z "$with_test_socket_dir" ; then
30 TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/meta/packages/dbus/dbus-1.1.20/99_dbus b/meta/packages/dbus/dbus-1.1.20/99_dbus
deleted file mode 100644
index 6821ae4dba..0000000000
--- a/meta/packages/dbus/dbus-1.1.20/99_dbus
+++ /dev/null
@@ -1 +0,0 @@
1d messagebus messagebus 0755 /var/run/dbus none
diff --git a/meta/packages/dbus/dbus-1.1.20/cross.patch b/meta/packages/dbus/dbus-1.1.20/cross.patch
deleted file mode 100644
index 268a3ae3de..0000000000
--- a/meta/packages/dbus/dbus-1.1.20/cross.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100
2+++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100
3@@ -719,6 +719,7 @@
4 exit (0);
5 ]])],
6 [ac_cv_have_abstract_sockets=yes],
7+ [ac_cv_have_abstract_sockets=no],
8 [ac_cv_have_abstract_sockets=no]
9 )])
10 AC_LANG_POP(C)
diff --git a/meta/packages/dbus/dbus-1.1.20/dbus-1.init b/meta/packages/dbus/dbus-1.1.20/dbus-1.init
deleted file mode 100644
index 4abc4cbf73..0000000000
--- a/meta/packages/dbus/dbus-1.1.20/dbus-1.init
+++ /dev/null
@@ -1,121 +0,0 @@
1#! /bin/sh
2### BEGIN INIT INFO
3# Provides: dbus
4# Required-Start: $remote_fs $syslog
5# Required-Stop: $remote_fs $syslog
6# Default-Start: 2 3 4 5
7# Default-Stop: 1
8# Short-Description: D-Bus systemwide message bus
9# Description: D-Bus is a simple interprocess messaging system, used
10# for sending messages between applications.
11### END INIT INFO
12#
13# -*- coding: utf-8 -*-
14# Debian init.d script for D-BUS
15# Copyright © 2003 Colin Walters <walters@debian.org>
16
17set -e
18
19DAEMON=/usr/bin/dbus-daemon
20NAME=dbus
21DAEMONUSER=messagebus
22PIDDIR=/var/run/dbus
23PIDFILE=$PIDDIR/pid
24UUIDDIR=/var/lib/dbus
25DESC="system message bus"
26EVENTDIR=/etc/dbus-1/event.d
27
28test -x $DAEMON || exit 0
29
30# Source defaults file; edit that file to configure this script.
31ENABLED=1
32PARAMS=""
33if [ -e /etc/default/dbus ]; then
34 . /etc/default/dbus
35fi
36
37test "$ENABLED" != "0" || exit 0
38
39start_it_up()
40{
41 if [ ! -d $PIDDIR ]; then
42 mkdir -p $PIDDIR
43 chown $DAEMONUSER $PIDDIR
44 chgrp $DAEMONUSER $PIDDIR
45 fi
46 if [ -e $PIDFILE ]; then
47 PIDDIR=/proc/$(cat $PIDFILE)
48 if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
49 echo "$DESC already started; not starting."
50 else
51 echo "Removing stale PID file $PIDFILE."
52 rm -f $PIDFILE
53 fi
54 fi
55
56 if [ ! -d $UUIDDIR ]; then
57 mkdir -p $UUIDDIR
58 chown $DAEMONUSER $UUIDDIR
59 chgrp $DAEMONUSER $UUIDDIR
60 fi
61
62 dbus-uuidgen --ensure
63
64 echo -n "Starting $DESC: "
65 start-stop-daemon --start --quiet --pidfile $PIDFILE \
66 --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
67 echo "$NAME."
68 if [ -d $EVENTDIR ]; then
69 run-parts --arg=start $EVENTDIR
70 fi
71}
72
73shut_it_down()
74{
75 if [ -d $EVENTDIR ]; then
76 # TODO: --reverse when busybox supports it
77 run-parts --arg=stop $EVENTDIR
78 fi
79 echo -n "Stopping $DESC: "
80 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
81 --user $DAEMONUSER
82 # We no longer include these arguments so that start-stop-daemon
83 # can do its job even given that we may have been upgraded.
84 # We rely on the pidfile being sanely managed
85 # --exec $DAEMON -- --system $PARAMS
86 echo "$NAME."
87 rm -f $PIDFILE
88}
89
90reload_it()
91{
92 echo -n "Reloading $DESC config: "
93 dbus-send --print-reply --system --type=method_call \
94 --dest=org.freedesktop.DBus \
95 / org.freedesktop.DBus.ReloadConfig > /dev/null
96 # hopefully this is enough time for dbus to reload it's config file.
97 echo "done."
98}
99
100case "$1" in
101 start)
102 start_it_up
103 ;;
104 stop)
105 shut_it_down
106 ;;
107 reload|force-reload)
108 reload_it
109 ;;
110 restart)
111 shut_it_down
112 sleep 1
113 start_it_up
114 ;;
115 *)
116 echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
117 exit 1
118 ;;
119esac
120
121exit 0
diff --git a/meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch b/meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch
deleted file mode 100644
index 20c8d1b501..0000000000
--- a/meta/packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: dbus-1.1.20/tools/dbus-launch.c
2===================================================================
3--- dbus-1.1.20.orig/tools/dbus-launch.c
4+++ dbus-1.1.20/tools/dbus-launch.c
5@@ -966,7 +966,9 @@ main (int argc, char **argv)
6 char write_pid_fd_as_string[MAX_FD_LEN];
7 char write_address_fd_as_string[MAX_FD_LEN];
8
9+#ifdef DBUS_BUILD_X11
10 xdisplay = NULL;
11+#endif
12
13 if (close_stderr)
14 do_close_stderr ();
diff --git a/meta/packages/dbus/dbus-1.1.20/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.1.20/fix-install-daemon.patch
deleted file mode 100644
index c31786357d..0000000000
--- a/meta/packages/dbus/dbus-1.1.20/fix-install-daemon.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: dbus-0.94/bus/Makefile.am
2===================================================================
3--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200
4+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200
5@@ -110,7 +110,7 @@
6 $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
7 chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
8 fi
9- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
10+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
11 $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
12 $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
13 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/meta/packages/dbus/dbus-1.1.20/tmpdir.patch b/meta/packages/dbus/dbus-1.1.20/tmpdir.patch
deleted file mode 100644
index 838b903f0a..0000000000
--- a/meta/packages/dbus/dbus-1.1.20/tmpdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
2+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
3@@ -1047,15 +1048,18 @@
4 AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
5
6 #### Find socket directories
7-if ! test -z "$TMPDIR" ; then
8- DEFAULT_SOCKET_DIR=$TMPDIR
9-elif ! test -z "$TEMP" ; then
10- DEFAULT_SOCKET_DIR=$TEMP
11-elif ! test -z "$TMP" ; then
12- DEFAULT_SOCKET_DIR=$TMP
13-else
14- DEFAULT_SOCKET_DIR=/tmp
15-fi
16+#if ! test -z "$TMPDIR" ; then
17+# DEFAULT_SOCKET_DIR=$TMPDIR
18+#elif ! test -z "$TEMP" ; then
19+# DEFAULT_SOCKET_DIR=$TEMP
20+#elif ! test -z "$TMP" ; then
21+# DEFAULT_SOCKET_DIR=$TMP
22+#else
23+# DEFAULT_SOCKET_DIR=/tmp
24+#fi
25+
26+# checks disabled to avoid expanding this at build time
27+DEFAULT_SOCKET_DIR=/tmp
28
29 if ! test -z "$with_test_socket_dir" ; then
30 TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/meta/packages/dbus/dbus-native_1.0.3.bb b/meta/packages/dbus/dbus-native_1.0.3.bb
deleted file mode 100644
index c237a7e8cf..0000000000
--- a/meta/packages/dbus/dbus-native_1.0.3.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1DESCRIPTION = "message bus system for applications to talk to one another"
2HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
3LICENSE = "GPL"
4SECTION = "base"
5
6PR = "r0"
7
8DEPENDS = "glib-2.0-native libxml2-native expat-native"
9
10DEFAULT_PREFERENCE = "-1"
11
12SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
13 file://cross.patch;patch=1 \
14 "
15
16inherit autotools pkgconfig gettext native
17
18EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
19 --disable-doxygen-docs --with-xml=expat --without-x"
20
21do_stage () {
22 oe_runmake install
23 autotools_stage_all
24
25 # for dbus-glib-native introspection generation
26 install -d ${STAGING_DATADIR}/dbus
27 install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
28}
diff --git a/meta/packages/dbus/dbus-native_1.1.20.bb b/meta/packages/dbus/dbus-native_1.1.20.bb
deleted file mode 100644
index 46683e25ee..0000000000
--- a/meta/packages/dbus/dbus-native_1.1.20.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1require dbus.inc
2inherit native
3
4DEPENDS = "glib-2.0-native libxml2-native expat-native"
5PR = "r2"
6
7SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
8
9do_stage() {
10 oe_runmake install
11 autotools_stage_all
12
13 # for dbus-glib-native introspection generation
14 install -d ${STAGING_DATADIR}/dbus
15 install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
16}
17
18do_install() {
19 :
20}
diff --git a/meta/packages/dbus/dbus_1.0.3.bb b/meta/packages/dbus/dbus_1.0.3.bb
deleted file mode 100644
index 4ccc807239..0000000000
--- a/meta/packages/dbus/dbus_1.0.3.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require dbus.inc
2DEFAULT_PREFERENCE = "1"
3
4PR = "r6"
diff --git a/meta/packages/dbus/dbus_1.1.20.bb b/meta/packages/dbus/dbus_1.1.20.bb
deleted file mode 100644
index 1f838de30e..0000000000
--- a/meta/packages/dbus/dbus_1.1.20.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1include dbus.inc
2
3PR = "r5"
4
5SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1 \
6 file://fix-install-daemon.patch;patch=1 "
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-06 14:43:07 +0000