summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-05 17:04:39 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-05 17:04:39 +0000
commit0d8a8c893226ec11bdfb51466199e1d748875338 (patch)
treea68fba4ce96cb15879041dd8e096ecb3b73db937 /meta/packages
parenteae7eb5bd559c1f4ae843820f2d4105066b3cc45 (diff)
downloadpoky-0d8a8c893226ec11bdfb51466199e1d748875338.tar.gz
dbus-native: Generate the dbus-bus-introspect.xml so dbus-glib recipes don't have to find the dbus source. Pass the location of the file to dbus-glib* with the --with-introspect and drop the now unneeded patch
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/dbus/dbus-glib-0.76/no-introspect.patch14
-rw-r--r--meta/packages/dbus/dbus-glib-native_0.76.bb5
-rw-r--r--meta/packages/dbus/dbus-glib_0.76.bb8
-rw-r--r--meta/packages/dbus/dbus-native_1.2.4.bb7
4 files changed, 14 insertions, 20 deletions
diff --git a/meta/packages/dbus/dbus-glib-0.76/no-introspect.patch b/meta/packages/dbus/dbus-glib-0.76/no-introspect.patch
deleted file mode 100644
index 9115801f71..0000000000
--- a/meta/packages/dbus/dbus-glib-0.76/no-introspect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Index: dbus-glib-0.73/tools/Makefile.am
2===================================================================
3--- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200
4+++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200
5@@ -3,9 +3,6 @@
6 nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
7 libdbus_glibdir = $(includedir)/dbus-1.0/dbus
8
9-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
10- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
11-
12 BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
13
14 if USE_INTROSPECT_XML
diff --git a/meta/packages/dbus/dbus-glib-native_0.76.bb b/meta/packages/dbus/dbus-glib-native_0.76.bb
index 4faa185753..9486a3ed37 100644
--- a/meta/packages/dbus/dbus-glib-native_0.76.bb
+++ b/meta/packages/dbus/dbus-glib-native_0.76.bb
@@ -1,5 +1,5 @@
1SECTION = "base" 1SECTION = "base"
2PR = "r0" 2PR = "r1"
3HOMEPAGE = "http://www.freedesktop.org/Software/dbus" 3HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
4DESCRIPTION = "message bus system for applications to talk to one another" 4DESCRIPTION = "message bus system for applications to talk to one another"
5LICENSE = "GPL" 5LICENSE = "GPL"
@@ -11,9 +11,10 @@ inherit autotools pkgconfig gettext native
11 11
12DEPENDS = "glib-2.0-native dbus-native" 12DEPENDS = "glib-2.0-native dbus-native"
13 13
14EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
15
14do_stage() { 16do_stage() {
15 oe_runmake install 17 oe_runmake install
16 install -d ${STAGING_DATADIR}/dbus 18 install -d ${STAGING_DATADIR}/dbus
17 install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
18 install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus 19 install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
19} 20}
diff --git a/meta/packages/dbus/dbus-glib_0.76.bb b/meta/packages/dbus/dbus-glib_0.76.bb
index 0a34c738c3..c69420e460 100644
--- a/meta/packages/dbus/dbus-glib_0.76.bb
+++ b/meta/packages/dbus/dbus-glib_0.76.bb
@@ -1,21 +1,21 @@
1SECTION = "base" 1SECTION = "base"
2PR = "r0" 2PR = "r1"
3HOMEPAGE = "http://www.freedesktop.org/Software/dbus" 3HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
4DESCRIPTION = "message bus system for applications to talk to one another" 4DESCRIPTION = "message bus system for applications to talk to one another"
5LICENSE = "GPL" 5LICENSE = "GPL"
6DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" 6DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
7 7
8SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ 8SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
9 file://no-examples.patch;patch=1 \ 9 file://no-examples.patch;patch=1"
10 file://no-introspect.patch;patch=1"
11 10
12inherit autotools pkgconfig gettext 11inherit autotools pkgconfig gettext
13 12
13EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
14
14FILES_${PN} = "${libdir}/lib*.so.*" 15FILES_${PN} = "${libdir}/lib*.so.*"
15FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" 16FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
16 17
17do_configure_prepend() { 18do_configure_prepend() {
18 install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
19 install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ 19 install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
20} 20}
21 21
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 29fd5a2cb9..617a8f95bc 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,6 +3,8 @@ inherit native
3 3
4DEPENDS = "glib-2.0-native libxml2-native expat-native" 4DEPENDS = "glib-2.0-native libxml2-native expat-native"
5 5
6PR = "r1"
7
6do_stage() { 8do_stage() {
7 oe_runmake install 9 oe_runmake install
8 autotools_stage_all 10 autotools_stage_all
@@ -10,6 +12,11 @@ do_stage() {
10 # for dbus-glib-native introspection generation 12 # for dbus-glib-native introspection generation
11 install -d ${STAGING_DATADIR}/dbus 13 install -d ${STAGING_DATADIR}/dbus
12 install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf 14 install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
15
16 # dbus-glib-native and dbus-glib need this xml file
17 install -d ${STAGING_DATADIR_NATIVE}/dbus/
18 cd ${S}
19 ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
13} 20}
14 21
15do_install() { 22do_install() {