mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 00:32:13 +02:00
Add dbus 1.1.1 (leave 1.0.2 as default)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3400 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
10
meta/packages/dbus/dbus-1.1.1/cross.patch
vendored
Normal file
10
meta/packages/dbus/dbus-1.1.1/cross.patch
vendored
Normal file
@@ -0,0 +1,10 @@
|
||||
--- /tmp/configure.in 2006-11-09 21:47:10.000000000 +0100
|
||||
+++ dbus-0.95/configure.in 2006-11-09 21:48:13.108554000 +0100
|
||||
@@ -719,6 +719,7 @@
|
||||
exit (0);
|
||||
]])],
|
||||
[ac_cv_have_abstract_sockets=yes],
|
||||
+ [ac_cv_have_abstract_sockets=no],
|
||||
[ac_cv_have_abstract_sockets=no]
|
||||
)])
|
||||
AC_LANG_POP(C)
|
||||
110
meta/packages/dbus/dbus-1.1.1/dbus-1.init
vendored
Normal file
110
meta/packages/dbus/dbus-1.1.1/dbus-1.init
vendored
Normal file
@@ -0,0 +1,110 @@
|
||||
#! /bin/sh
|
||||
# -*- coding: utf-8 -*-
|
||||
# Debian init.d script for D-BUS
|
||||
# Copyright © 2003 Colin Walters <walters@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
|
||||
13
meta/packages/dbus/dbus-1.1.1/fix-install-daemon.patch
vendored
Normal file
13
meta/packages/dbus/dbus-1.1.1/fix-install-daemon.patch
vendored
Normal file
@@ -0,0 +1,13 @@
|
||||
Index: dbus-0.94/bus/Makefile.am
|
||||
===================================================================
|
||||
--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200
|
||||
+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200
|
||||
@@ -110,7 +110,7 @@
|
||||
$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
|
||||
chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
|
||||
fi
|
||||
- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
|
||||
+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
|
||||
$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
|
||||
$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
|
||||
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
|
||||
30
meta/packages/dbus/dbus-1.1.1/tmpdir.patch
vendored
Normal file
30
meta/packages/dbus/dbus-1.1.1/tmpdir.patch
vendored
Normal file
@@ -0,0 +1,30 @@
|
||||
--- dbus-0.22/configure.in.orig 2004-08-13 00:57:16.000000000 +0200
|
||||
+++ dbus-0.22/configure.in 2004-12-30 21:15:57.000000000 +0100
|
||||
@@ -1047,15 +1048,18 @@
|
||||
AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
|
||||
|
||||
#### Find socket directories
|
||||
-if ! test -z "$TMPDIR" ; then
|
||||
- DEFAULT_SOCKET_DIR=$TMPDIR
|
||||
-elif ! test -z "$TEMP" ; then
|
||||
- DEFAULT_SOCKET_DIR=$TEMP
|
||||
-elif ! test -z "$TMP" ; then
|
||||
- DEFAULT_SOCKET_DIR=$TMP
|
||||
-else
|
||||
- DEFAULT_SOCKET_DIR=/tmp
|
||||
-fi
|
||||
+#if ! test -z "$TMPDIR" ; then
|
||||
+# DEFAULT_SOCKET_DIR=$TMPDIR
|
||||
+#elif ! test -z "$TEMP" ; then
|
||||
+# DEFAULT_SOCKET_DIR=$TEMP
|
||||
+#elif ! test -z "$TMP" ; then
|
||||
+# DEFAULT_SOCKET_DIR=$TMP
|
||||
+#else
|
||||
+# DEFAULT_SOCKET_DIR=/tmp
|
||||
+#fi
|
||||
+
|
||||
+# checks disabled to avoid expanding this at build time
|
||||
+DEFAULT_SOCKET_DIR=/tmp
|
||||
|
||||
if ! test -z "$with_test_socket_dir" ; then
|
||||
TEST_SOCKET_DIR="$with_test_socket_dir"
|
||||
31
meta/packages/dbus/dbus-native_1.1.1.bb
Normal file
31
meta/packages/dbus/dbus-native_1.1.1.bb
Normal file
@@ -0,0 +1,31 @@
|
||||
DESCRIPTION = "message bus system for applications to talk to one another"
|
||||
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
|
||||
LICENSE = "GPL"
|
||||
SECTION = "base"
|
||||
|
||||
PR = "r0"
|
||||
|
||||
DEPENDS = "glib-2.0-native libxml2-native expat-native"
|
||||
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
|
||||
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
|
||||
file://cross.patch;patch=1 \
|
||||
"
|
||||
|
||||
inherit autotools pkgconfig gettext native
|
||||
|
||||
S = "${WORKDIR}/dbus-${PV}"
|
||||
|
||||
EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
|
||||
--disable-doxygen-docs --with-xml=expat --without-x"
|
||||
|
||||
do_stage () {
|
||||
oe_runmake install
|
||||
autotools_stage_all
|
||||
|
||||
# for dbus-glib-native introspection generation
|
||||
install -d ${STAGING_DATADIR}/dbus
|
||||
install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
|
||||
}
|
||||
@@ -1,5 +1,3 @@
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
SECTION = "base"
|
||||
HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
|
||||
DESCRIPTION = "message bus system for applications to talk to one another"
|
||||
|
||||
63
meta/packages/dbus/dbus_1.1.1.bb
Normal file
63
meta/packages/dbus/dbus_1.1.1.bb
Normal file
@@ -0,0 +1,63 @@
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
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 = "r3"
|
||||
|
||||
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"
|
||||
|
||||
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-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)
|
||||
}
|
||||
Reference in New Issue
Block a user