[oe-commits] org.oe.dev dbus: make Marcin happy:

[koen commit]

dbus: make Marcin happy:
* create a dbus.inc
* remove outdated dbi
* remove DEFAULT_PREFERENCE from 1.0.1

* dbus-glib still has both versions since 0.72 doesn't build for me

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 184d60b944ea10ce3ad82441a2729777a0ff3122
ViewMTN: http://monotone.openembedded.org/revision.psp?id=184d60b944ea10ce3ad82441a2729777a0ff3122
Files:
1
packages/dbus/dbus-0.91
packages/dbus/dbus-0.91/dbus-1.init
packages/dbus/dbus-0.91/fix-segfault.patch
packages/dbus/dbus-0.92
packages/dbus/dbus-0.92/dbus-1.init
packages/dbus/dbus-0.92/fix-install-daemon.patch
packages/dbus/dbus-0.94
packages/dbus/dbus-0.94/dbus-1.init
packages/dbus/dbus-0.94/fix-install-daemon.patch
packages/dbus/dbus-1.0.0
packages/dbus/dbus-1.0.0/cross.patch
packages/dbus/dbus-1.0.0/dbus-1.init
packages/dbus/dbus-1.0.0/fix-install-daemon.patch
packages/dbus/dbus-native_0.91.bb
packages/dbus/dbus-native_0.92.bb
packages/dbus/dbus-native_0.94.bb
packages/dbus/dbus_0.91.bb
packages/dbus/dbus_0.92.bb
packages/dbus/dbus_0.94.bb
packages/dbus/dbus_1.0.0.bb
packages/dbus/dbus_1.0.1.bb
Diffs:

#
# mt diff -rbe1e3e66ab7e34a68900b61bc0b7832b1f627680 -r184d60b944ea10ce3ad82441a2729777a0ff3122
#
# 
# 
# delete "packages/dbus/dbus-0.91"
# 
# delete "packages/dbus/dbus-0.91/dbus-1.init"
# 
# delete "packages/dbus/dbus-0.91/fix-segfault.patch"
# 
# delete "packages/dbus/dbus-0.92"
# 
# delete "packages/dbus/dbus-0.92/dbus-1.init"
# 
# delete "packages/dbus/dbus-0.92/fix-install-daemon.patch"
# 
# delete "packages/dbus/dbus-0.94"
# 
# delete "packages/dbus/dbus-0.94/dbus-1.init"
# 
# delete "packages/dbus/dbus-0.94/fix-install-daemon.patch"
# 
# delete "packages/dbus/dbus-1.0.0"
# 
# delete "packages/dbus/dbus-1.0.0/cross.patch"
# 
# delete "packages/dbus/dbus-1.0.0/dbus-1.init"
# 
# delete "packages/dbus/dbus-1.0.0/fix-install-daemon.patch"
# 
# delete "packages/dbus/dbus-native_0.91.bb"
# 
# delete "packages/dbus/dbus-native_0.92.bb"
# 
# delete "packages/dbus/dbus-native_0.94.bb"
# 
# delete "packages/dbus/dbus_0.91.bb"
# 
# delete "packages/dbus/dbus_0.92.bb"
# 
# delete "packages/dbus/dbus_0.94.bb"
# 
# delete "packages/dbus/dbus_1.0.0.bb"
# 
# patch "packages/dbus/dbus_1.0.1.bb"
#  from [be29523998fce9ccc901aa356fbc2fcbba99fd01]
#    to [6ed19ca20d60c52cb6cc1d84d8d604df92d23261]
# 
============================================================
--- packages/dbus/dbus_1.0.1.bb	be29523998fce9ccc901aa356fbc2fcbba99fd01
+++ packages/dbus/dbus_1.0.1.bb	6ed19ca20d60c52cb6cc1d84d8d604df92d23261
@@ -1,65 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
+require dbus.inc
 
-SECTION = "base"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl"
-
 PR = "r1"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
-	   file://tmpdir.patch;patch=1 \
-	   file://dbus-1.init \
-	   file://fix-segfault.patch;patch=1 \
-           file://cross.patch;patch=1 \
-	   file://fix-install-daemon.patch;patch=1"
-
-inherit autotools pkgconfig update-rc.d gettext
-
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "defaults"
-
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
-
-FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
-
-pkg_postinst_dbus() {
-#!/bin/sh
-
-# can't do adduser stuff offline
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-
-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"
-}
-
-EXTRA_OECONF = "--disable-qt  --disable-qt3 --disable-gtk --disable-tests \
-		--disable-checks --disable-xml-docs --disable-doxygen-docs \
-		--with-xml=expat --without-x"
-
-do_stage () {
-	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-}
-
-do_install_append () {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
-}
-
-python populate_packages_prepend () {
-	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
-		bb.data.setVar('PKG_dbus', 'dbus-1', d)
-}