Re: [OE-core] [PATCH] dbus: update to 1.4.12

2011-06-30 Thread Saul Wold 

On 06/23/2011 05:32 AM, Koen Kooi wrote:

The tmpdir patch has been regenerated and can now be applied with git-am, no 
functional changes.

The biggest improvement is that dbus will log to syslog nowadays:

[   22.238708]29dbus[237]: [system] Activating service 
name='fi.w1.wpa_supplicant1' (using servicehelper)

Signed-off-by: Koen Kooik...@dominion.thruhere.net
---
  meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init   |  121 ---
  meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch  |   36 ---
  meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init  |  121 +++
  meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch |   44 
  meta/recipes-core/dbus/dbus_1.4.1.bb|6 -
  meta/recipes-core/dbus/dbus_1.4.12.bb   |4 +
  6 files changed, 169 insertions(+), 163 deletions(-)
  delete mode 100644 meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init
  delete mode 100644 meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch
  create mode 100644 meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init
  create mode 100644 meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch
  delete mode 100644 meta/recipes-core/dbus/dbus_1.4.1.bb
  create mode 100644 meta/recipes-core/dbus/dbus_1.4.12.bb

diff --git a/meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init 
b/meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init
deleted file mode 100644
index 4abc4cb..000
--- a/meta/recipes-core/dbus/dbus-1.4.1/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 Walterswalt...@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/recipes-core/dbus/dbus-1.4.1/tmpdir.patch 
b/meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch
deleted file mode 100644
index de0766a..000
--- a/meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status: Inappropriate [embedded]
-
-# avoid to check tmp dir at build time. instead uses hard coded /tmp here
-#
-# comment added by Kevin Tiankevin.t...@intel.com
-
 dbus-0.22/configure.in.orig2004-08-13 00:57:16.0 +0200
-+++ dbus-0.22/configure.in 2004-12-30 21:15:57.0 +0100
-@@ -1047,15 +1048,18 @@
- AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
-
-  Find socket directories
--if ! test -z

[OE-core] [PATCH] dbus: update to 1.4.12

2011-06-23 Thread Koen Kooi 
The tmpdir patch has been regenerated and can now be applied with git-am, no 
functional changes.

The biggest improvement is that dbus will log to syslog nowadays:

[   22.238708] 29dbus[237]: [system] Activating service 
name='fi.w1.wpa_supplicant1' (using servicehelper)

Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
 meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init   |  121 ---
 meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch  |   36 ---
 meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init  |  121 +++
 meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch |   44 
 meta/recipes-core/dbus/dbus_1.4.1.bb|6 -
 meta/recipes-core/dbus/dbus_1.4.12.bb   |4 +
 6 files changed, 169 insertions(+), 163 deletions(-)
 delete mode 100644 meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init
 delete mode 100644 meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch
 create mode 100644 meta/recipes-core/dbus/dbus-1.4.12/dbus-1.init
 create mode 100644 meta/recipes-core/dbus/dbus-1.4.12/tmpdir.patch
 delete mode 100644 meta/recipes-core/dbus/dbus_1.4.1.bb
 create mode 100644 meta/recipes-core/dbus/dbus_1.4.12.bb

diff --git a/meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init 
b/meta/recipes-core/dbus/dbus-1.4.1/dbus-1.init
deleted file mode 100644
index 4abc4cb..000
--- a/meta/recipes-core/dbus/dbus-1.4.1/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 walt...@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/recipes-core/dbus/dbus-1.4.1/tmpdir.patch 
b/meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch
deleted file mode 100644
index de0766a..000
--- a/meta/recipes-core/dbus/dbus-1.4.1/tmpdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status: Inappropriate [embedded]
-
-# avoid to check tmp dir at build time. instead uses hard coded /tmp here
-#
-# comment added by Kevin Tian kevin.t...@intel.com
-
 dbus-0.22/configure.in.orig2004-08-13 00:57:16.0 +0200
-+++ dbus-0.22/configure.in 2004-12-30 21:15:57.0 +0100
-@@ -1047,15 +1048,18 @@
- AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
- 
-  Find socket directories
--if ! test -z $TMPDIR ; then
--   DEFAULT_SOCKET_DIR=$TMPDIR