summaryrefslogtreecommitdiffstats
path: root/meta/packages/dbus
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 16:53:07 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-04 16:53:07 +0000
commit0a7e1e3ffcbe600af074d3773041c95ed28d7799 (patch)
treeeabba0f27c9bfb702fd972f9d4d08b87981b740c /meta/packages/dbus
parentdfb52cedd076c66c12644b1b09b3750772bd93bc (diff)
downloadpoky-0a7e1e3ffcbe600af074d3773041c95ed28d7799.tar.gz
dbus: upgrade 1.1.4 to 1.1.20 (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3905 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/dbus')
-rw-r--r--meta/packages/dbus/dbus-native_1.1.20.bb18
-rw-r--r--meta/packages/dbus/dbus-native_1.1.4.bb31
-rw-r--r--meta/packages/dbus/dbus.inc74
-rw-r--r--meta/packages/dbus/dbus_1.1.20.bb5
-rw-r--r--meta/packages/dbus/dbus_1.1.4.bb3
5 files changed, 72 insertions, 59 deletions
diff --git a/meta/packages/dbus/dbus-native_1.1.20.bb b/meta/packages/dbus/dbus-native_1.1.20.bb
new file mode 100644
index 0000000000..3578572d47
--- /dev/null
+++ b/meta/packages/dbus/dbus-native_1.1.20.bb
@@ -0,0 +1,18 @@
1require dbus.inc
2inherit native
3
4DEPENDS = "glib-2.0-native libxml2-native expat-native"
5FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
6
7do_stage() {
8 oe_runmake install
9 autotools_stage_all
10
11 # for dbus-glib-native introspection generation
12 install -d ${STAGING_DATADIR}/dbus
13 install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
14}
15
16do_install() {
17 :
18}
diff --git a/meta/packages/dbus/dbus-native_1.1.4.bb b/meta/packages/dbus/dbus-native_1.1.4.bb
deleted file mode 100644
index 55889a1a8b..0000000000
--- a/meta/packages/dbus/dbus-native_1.1.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
1DESCRIPTION = "message bus system for applications to talk to one another"
2HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
3LICENSE = "GPL"
4SECTION = "base"
5
6PR = "r0"
7
8DEPENDS = "glib-2.0-native libxml2-native expat-native"
9
10DEFAULT_PREFERENCE = "-1"
11
12FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
14 file://cross.patch;patch=1 \
15 "
16
17inherit autotools pkgconfig gettext native
18
19S = "${WORKDIR}/dbus-${PV}"
20
21EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
22 --disable-doxygen-docs --with-xml=expat --without-x"
23
24do_stage () {
25 oe_runmake install
26 autotools_stage_all
27
28 # for dbus-glib-native introspection generation
29 install -d ${STAGING_DATADIR}/dbus
30 install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
31}
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 256ccde0b4..5cf5e91069 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -1,18 +1,17 @@
1SECTION = "base"
2PR = "r0"
3HOMEPAGE = "http://dbus.freedesktop.org"
4DESCRIPTION = "Message bus system for applications to talk to one another" 1DESCRIPTION = "Message bus system for applications to talk to one another"
2HOMEPAGE = "http://dbus.freedesktop.org"
3SECTION = "base"
5LICENSE = "GPL" 4LICENSE = "GPL"
6DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11" 5DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11"
7 6
8DEFAULT_PREFERENCE = "-1" 7SRC_URI = "\
9 8 http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
10SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 9 file://cross.patch;patch=1 \
11 file://cross.patch;patch=1 \ 10 file://tmpdir.patch;patch=1 \
12 file://tmpdir.patch;patch=1 \ 11 file://fix-install-daemon.patch;patch=1 \
13 file://fix-install-daemon.patch;patch=1 \ 12 file://dbus-1.init \
14 file://dbus-1.init" 13"
15 14S = "${WORKDIR}/dbus-${PV}"
16 15
17inherit autotools pkgconfig update-rc.d gettext 16inherit autotools pkgconfig update-rc.d gettext
18 17
@@ -21,8 +20,25 @@ INITSCRIPT_PARAMS = "defaults"
21 20
22CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" 21CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
23 22
24FILES_${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.*" 23DEBIANNAME_${PN} = "dbus-1"
25FILES_${PN}-dev += "${libdir}/dbus-1.0/include" 24
25PACKAGES =+ "${PN}-lib"
26
27FILES_${PN} = "\
28${bindir}/dbus-daemon* \
29${bindir}/dbus-uuidgen \
30${bindir}/dbus-launch \
31${bindir}/dbus-cleanup-sockets \
32${bindir}/dbus-send \
33${bindir}/dbus-monitor \
34${libexecdir}/dbus* \
35${sysconfdir} \
36${datadir}/dbus-1/services \
37${datadir}/dbus-1/system-services \
38"
39FILES_${PN}-lib = "${libdir}/lib*.so.*"
40RRECOMMENDS_${PN}-lib = "${PN}"
41FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/"
26 42
27pkg_postinst_dbus() { 43pkg_postinst_dbus() {
28#!/bin/sh 44#!/bin/sh
@@ -38,15 +54,24 @@ MESSAGEHOME=/var/run/dbus
38mkdir -p $MESSAGEHOME || true 54mkdir -p $MESSAGEHOME || true
39chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER" 55chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
40chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" 56chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
57
41grep -q netdev: /etc/group || addgroup netdev 58grep -q netdev: /etc/group || addgroup netdev
59chmod u+s /usr/libexec/dbus-daemon-launch-helper
42} 60}
43 61
44EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \ 62EXTRA_OECONF = "\
45 --disable-asserts --disable-xml-docs --disable-doxygen-docs \ 63 --disable-qt \
46 --with-xml=expat --with-x" 64 --disable-qt3 \
47 65 --disable-gtk \
48 66 --disable-tests \
49do_stage () { 67 --disable-checks \
68 --disable-xml-docs \
69 --disable-doxygen-docs \
70 --with-xml=expat \
71 --with-x \
72"
73
74do_stage() {
50 oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR} 75 oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
51 76
52 autotools_stage_includes 77 autotools_stage_includes
@@ -55,12 +80,11 @@ do_stage () {
55 install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/ 80 install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
56} 81}
57 82
58do_install_append () { 83do_install_append() {
59 install -d ${D}${sysconfdir}/init.d 84 install -d ${D}${sysconfdir}/init.d
60 install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 85 install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
61} 86 # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
62 87 if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
63python populate_packages_prepend () { 88 install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
64 if (bb.data.getVar('DEBIAN_NAMES', d, 1)): 89 fi
65 bb.data.setVar('PKG_dbus', 'dbus-1', d)
66} 90}
diff --git a/meta/packages/dbus/dbus_1.1.20.bb b/meta/packages/dbus/dbus_1.1.20.bb
new file mode 100644
index 0000000000..c951fc79ec
--- /dev/null
+++ b/meta/packages/dbus/dbus_1.1.20.bb
@@ -0,0 +1,5 @@
1include dbus.inc
2
3PR = "r1"
4
5SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
diff --git a/meta/packages/dbus/dbus_1.1.4.bb b/meta/packages/dbus/dbus_1.1.4.bb
deleted file mode 100644
index e90a67e290..0000000000
--- a/meta/packages/dbus/dbus_1.1.4.bb
+++ /dev/null
@@ -1,3 +0,0 @@
1require dbus.inc
2
3PR = "r2"