From 67eeb71308e8307a99d12417dfb0fe8f016814da Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Sat, 10 Jul 2010 17:22:04 +0800 Subject: dbus: upgrade to 1.2.24 [Patches] REMOVE _cross.patch_: fixed in upstream KEEP _tmpdir.patch_: disable tmpdir test in build system UPDATE _fix-install-daemon.patch_: use automake for binary install instead of manual tweaks. extend it to cover dbus-daemon-launch-helper [Recipe] - remove native recipes and old versions - install to STAGING_DATADIR_NATIVE directly - remove manual tweak on dbus-daemon-launch-helper install - remove stale config options - adjust indention - enable dbus in runlevel 3 since networkmanager has requirement at that level - remove preferred versions in poky-fixed-revisions.inc. Based on discussion with Josh, the preferred version is there just because dbus is not carefully tested before Signed-off-by: Kevin Tian --- meta/packages/dbus/dbus-1.2.14/99_dbus | 1 - meta/packages/dbus/dbus-1.2.14/cross.patch | 10 -- meta/packages/dbus/dbus-1.2.14/dbus-1.init | 121 --------------------- .../dbus/dbus-1.2.14/fix-install-daemon.patch | 37 ------- meta/packages/dbus/dbus-1.2.14/tmpdir.patch | 30 ----- 5 files changed, 199 deletions(-) delete mode 100644 meta/packages/dbus/dbus-1.2.14/99_dbus delete mode 100644 meta/packages/dbus/dbus-1.2.14/cross.patch delete mode 100644 meta/packages/dbus/dbus-1.2.14/dbus-1.init delete mode 100644 meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch delete mode 100644 meta/packages/dbus/dbus-1.2.14/tmpdir.patch (limited to 'meta/packages/dbus/dbus-1.2.14') 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 - -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 7012995fb..000000000 --- a/meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: dbus-1.2.14/bus/Makefile.am -=================================================================== ---- dbus-1.2.14.orig/bus/Makefile.am 2009-04-17 20:45:29.000000000 +0100 -+++ dbus-1.2.14/bus/Makefile.am 2009-11-13 09:47:24.000000000 +0000 -@@ -149,7 +149,7 @@ - - ## we use noinst_PROGRAMS not check_PROGRAMS so that we build - ## even when not doing "make check" --noinst_PROGRAMS=$(TESTS) dbus-daemon dbus-daemon-launch-helper-test dbus-daemon-launch-helper -+noinst_PROGRAMS=$(TESTS) dbus-daemon-launch-helper-test dbus-daemon-launch-helper - - bus_test_system_SOURCES= \ - $(XML_SOURCES) \ -@@ -171,20 +171,17 @@ - bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS) - bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ - -+dbusdaemondir = $(DBUS_DAEMONDIR) -+dbusdaemon_PROGRAMS = dbus-daemon -+ - ## mop up the gcov files - clean-local: - /bin/rm *.bb *.bbg *.da *.gcov || true - - uninstall-hook: -- rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon - rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper - - install-data-hook: -- if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \ -- $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ -- chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ -- fi -- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus - $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d 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" -- cgit v1.2.3