[oe-commits] org.oe.dev dbus: sync with poky and use .inc file
koen commit
openembedded-commits at lists.openembedded.org
Sat Sep 29 08:04:56 UTC 2007
dbus: sync with poky and use .inc file
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 4d114b16039cc9044c3762876ed8924145eba0f3
ViewMTN: http://monotone.openembedded.org/revision/info/4d114b16039cc9044c3762876ed8924145eba0f3
Files:
1
packages/dbus/dbus-1.0.2/dbus-1.init
packages/dbus/dbus.inc
packages/dbus/dbus_1.0.2.bb
Diffs:
#
# mt diff -r56e95791c828d6464270f3254904f141e550abc4 -r4d114b16039cc9044c3762876ed8924145eba0f3
#
#
#
# patch "packages/dbus/dbus-1.0.2/dbus-1.init"
# from [4dc37cbdcc8bbcdd8432d6104bddd92535f362d1]
# to [9bdceca2b1986db6ec905e8b53e6402be0b88e9a]
#
# patch "packages/dbus/dbus.inc"
# from [f2c229e2a89e9b3da17fe11252f2d44b73ce7007]
# to [b5e275c2912e6e351b2290851f4999d093928a67]
#
# patch "packages/dbus/dbus_1.0.2.bb"
# from [e167627a54c23293d250970ba68ae39a4a15fa60]
# to [8a664bd22c757efec6cfcbfa1ff5d60cbae06c42]
#
============================================================
--- packages/dbus/dbus-1.0.2/dbus-1.init 4dc37cbdcc8bbcdd8432d6104bddd92535f362d1
+++ packages/dbus/dbus-1.0.2/dbus-1.init 9bdceca2b1986db6ec905e8b53e6402be0b88e9a
@@ -62,6 +62,7 @@ shut_it_down()
shut_it_down()
{
if [ -d $EVENTDIR ]; then
+ # TODO: --reverse when busybox supports it
run-parts --arg=stop $EVENTDIR
fi
echo -n "Stopping $DESC: "
@@ -75,6 +76,16 @@ shut_it_down()
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
@@ -82,13 +93,16 @@ case "$1" in
stop)
shut_it_down
;;
- restart|force-reload)
+ reload|force-reload)
+ reload_it
+ ;;
+ restart)
shut_it_down
sleep 1
start_it_up
;;
*)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
exit 1
;;
esac
============================================================
--- packages/dbus/dbus.inc f2c229e2a89e9b3da17fe11252f2d44b73ce7007
+++ packages/dbus/dbus.inc b5e275c2912e6e351b2290851f4999d093928a67
@@ -1,15 +1,18 @@ LICENSE = "GPL"
SECTION = "base"
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
DESCRIPTION = "message bus system for applications to talk to one another"
LICENSE = "GPL"
-DEPENDS = "expat virtual/libintl"
+DEPENDS = "expat glib-2.0 virtual/libintl"
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+ file://cross.patch;patch=1 \
file://tmpdir.patch;patch=1 \
file://dbus-1.init \
- file://cross.patch;patch=1 \
- file://fix-install-daemon.patch;patch=1"
+ ${SRC_URI_EXTRA}"
+
inherit autotools pkgconfig update-rc.d gettext
INITSCRIPT_NAME = "dbus-1"
@@ -17,8 +20,8 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/
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"
+FILES_${PN} = "${bindir}/dbus-daemon-1 ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
pkg_postinst_dbus() {
#!/bin/sh
@@ -36,12 +39,14 @@ chown "$MESSAGEUSER"."$MESSAGEUSER" "$ME
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 \
+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}
+ oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
autotools_stage_includes
============================================================
--- packages/dbus/dbus_1.0.2.bb e167627a54c23293d250970ba68ae39a4a15fa60
+++ packages/dbus/dbus_1.0.2.bb 8a664bd22c757efec6cfcbfa1ff5d60cbae06c42
@@ -1,5 +1,14 @@ require dbus.inc
require dbus.inc
-SRC_URI += " file://fix-waitpid.patch;patch=1"
+DEFAULT_PREFERENCE = "1"
+PR = "r5"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+ file://tmpdir.patch;patch=1 \
+ file://dbus-1.init \
+ file://cross.patch;patch=1 \
+ file://fix-install-daemon.patch;patch=1"
+
+
+
-PR = "r4"
More information about the Openembedded-commits
mailing list