Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/home/pb_/packages

2004/06/07 16:12:17+02:00 uni-frankfurt.de!pb_
improve D-BUS packaging

BKrev: 40c477c6eq9SpfV_KwvidIuCK4gn2A

diff --git a/dbus/dbus/dbus-1.init b/dbus/dbus/dbus-1.init
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/dbus/dbus_0.21.oe b/dbus/dbus_0.21.oe
index afdc3dc..99d999d 100644 (file)
--- a/dbus/dbus_0.21.oe
+++ b/dbus/dbus_0.21.oe
@@ -1,11 +1,30 @@
+PR = "r1"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 DESCRIPTION = "message bus system for applications to talk to one another"
 DEPENDS = "expat glib-2.0"
 
 SRC_URI = "http://freedesktop.org/Software/dbus/releases/dbus-${PV}.tar.gz \
-          file://cross.patch;patch=1"
+          file://cross.patch;patch=1 \
+          file://dbus-1.init"
 
-inherit autotools  pkgconfig
+inherit autotools pkgconfig update-rc.d
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN}-dev += " ${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+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-gtk --disable-tests \
                --disable-checks --disable-xml-docs --disable-doxygen-docs \
@@ -27,3 +46,13 @@ do_stage () {
        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/
+}
+
+python populate_packages_prepend () {
+       if (oe.data.getVar('DEBIAN_NAMES', d, 1)):
+               oe.data.setVar('PKG_dbus', 'dbus-1', d)
+}