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 <kevin.tian@intel.com>

1 files changed, 48 insertions, 45 deletions

diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index af866a9537..e1efaeed46 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -5,16 +5,15 @@ LICENSE = "AFL2.1 | GPLv2+"
 DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11 libsm"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-           file://cross.patch; \
            file://tmpdir.patch; \
            file://fix-install-daemon.patch; \
            file://dbus-1.init \
            file://99_dbus"
 
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext update-rc.d
 
 INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "start 02 5 2 . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
 
 CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
 
@@ -22,65 +21,69 @@ DEBIANNAME_${PN} = "dbus-1"
 
 PACKAGES =+ "${PN}-lib"
 
-FILES_${PN} = "\
-${bindir}/dbus-daemon* \
-${bindir}/dbus-uuidgen \
-${bindir}/dbus-launch \
-${bindir}/dbus-cleanup-sockets \
-${bindir}/dbus-send \
-${bindir}/dbus-monitor \
-${libexecdir}/dbus* \
-${sysconfdir} \
-${datadir}/dbus-1/services \
-${datadir}/dbus-1/system-services \
-"
+FILES_${PN} = "${bindir}/dbus-daemon* \
+               ${bindir}/dbus-uuidgen \
+               ${bindir}/dbus-launch \
+               ${bindir}/dbus-cleanup-sockets \
+               ${bindir}/dbus-send \
+               ${bindir}/dbus-monitor \
+               ${libexecdir}/dbus* \
+               ${sysconfdir} \
+               ${datadir}/dbus-1/services \
+               ${datadir}/dbus-1/system-services"
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
 RRECOMMENDS_${PN}-lib = "${PN}"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 
 pkg_postinst_dbus() {
-#!/bin/sh
-
-# can't do adduser stuff offline
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
+	# can't do adduser stuff offline
+	if [ "x$D" != "x" ]; then
+		exit 1
+	fi
 
-MESSAGEUSER=messagebus
-MESSAGEHOME=/var/run/dbus
+	MESSAGEUSER=messagebus
+	MESSAGEHOME=/var/run/dbus
 
-mkdir -p $MESSAGEHOME || true
-chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
-chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+	mkdir -p $MESSAGEHOME || true
+	chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+	chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \
+		adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password \
+			--ingroup "$MESSAGEUSER" "$MESSAGEUSER"
 
-grep -q netdev: /etc/group || addgroup netdev
-chmod u+s /usr/libexec/dbus-daemon-launch-helper
+	grep -q netdev: /etc/group || addgroup netdev
+	chmod u+s /usr/libexec/dbus-daemon-launch-helper
 }
 
 EXTRA_OECONF_X = "--with-x"
+EXTRA_OECONF_X_virtclass-native = "--without-x"
 
-EXTRA_OECONF = "\
-  --disable-qt \
-  --disable-qt3 \
-  --disable-gtk \
-  --disable-tests \
-  --disable-checks \
-  --disable-xml-docs \
-  --disable-doxygen-docs \
-  --disable-libaudit \
-  --with-xml=expat \
-  ${EXTRA_OECONF_X} \
-"
+EXTRA_OECONF = "--disable-tests \
+                --disable-checks \
+                --disable-xml-docs \
+                --disable-doxygen-docs \
+                --disable-libaudit \
+                --with-xml=expat \
+                ${EXTRA_OECONF_X}"
 
 do_install() {
 	autotools_do_install
+
 	install -d ${D}/etc/default/volatiles
 	install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/
 
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
-	# the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
-	if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
-		install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
-	fi
 }
+
+do_install_virtclass-native() {
+	autotools_do_install
+
+	# for dbus-glib-native introspection generation
+	install -d ${STAGING_DATADIR_NATIVE}/dbus/
+	# N.B. is below install actually required?
+	install -m 0644 bus/session.conf ${STAGING_DATADIR_NATIVE}/dbus/session.conf
+	
+	# dbus-glib-native and dbus-glib need this xml file
+	./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
+}
+BBCLASSEXTEND = "native"