summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-05 17:21:56 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-05 17:21:56 +0000
commitf0b6ce84826e63cd9c95e0427ee7890c454bc364 (patch)
tree2ec818ec1f9218f94accafb86c560a69fb809291 /meta
parent0d8a8c893226ec11bdfb51466199e1d748875338 (diff)
downloadpoky-f0b6ce84826e63cd9c95e0427ee7890c454bc364.tar.gz
dbus-glib: Factor into a common .inc file and cleanup the recipe using autotools staging
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch (renamed from meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch)0
-rw-r--r--meta/packages/dbus/dbus-glib-native_0.76.bb18
-rw-r--r--meta/packages/dbus/dbus-glib.inc17
-rw-r--r--meta/packages/dbus/dbus-glib_0.76.bb24
4 files changed, 25 insertions, 34 deletions
diff --git a/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
index a04f404f75..a04f404f75 100644
--- a/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
+++ b/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
diff --git a/meta/packages/dbus/dbus-glib-native_0.76.bb b/meta/packages/dbus/dbus-glib-native_0.76.bb
index 9486a3ed37..f3bd5ab13d 100644
--- a/meta/packages/dbus/dbus-glib-native_0.76.bb
+++ b/meta/packages/dbus/dbus-glib-native_0.76.bb
@@ -1,20 +1,14 @@
1SECTION = "base" 1require dbus-glib.inc
2PR = "r1" 2inherit native
3HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
4DESCRIPTION = "message bus system for applications to talk to one another"
5LICENSE = "GPL"
6
7SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
8 file://run-with-tmp-session-bus.patch;patch=1"
9
10inherit autotools pkgconfig gettext native
11 3
12DEPENDS = "glib-2.0-native dbus-native" 4DEPENDS = "glib-2.0-native dbus-native"
13 5
14EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" 6PR = "r2"
7
8SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1"
15 9
16do_stage() { 10do_stage() {
17 oe_runmake install 11 autotools_stage_all
18 install -d ${STAGING_DATADIR}/dbus 12 install -d ${STAGING_DATADIR}/dbus
19 install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus 13 install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
20} 14}
diff --git a/meta/packages/dbus/dbus-glib.inc b/meta/packages/dbus/dbus-glib.inc
new file mode 100644
index 0000000000..30ad99c7c8
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib.inc
@@ -0,0 +1,17 @@
1SECTION = "base"
2HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
3DESCRIPTION = "message bus system for applications to talk to one another"
4LICENSE = "GPL"
5DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
6
7SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
8 file://no-examples.patch;patch=1"
9
10inherit autotools_stage pkgconfig gettext
11
12EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
13
14FILES_${PN} = "${libdir}/lib*.so.*"
15FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
16FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
17
diff --git a/meta/packages/dbus/dbus-glib_0.76.bb b/meta/packages/dbus/dbus-glib_0.76.bb
index c69420e460..172aad63a9 100644
--- a/meta/packages/dbus/dbus-glib_0.76.bb
+++ b/meta/packages/dbus/dbus-glib_0.76.bb
@@ -1,28 +1,8 @@
1SECTION = "base" 1require dbus-glib.inc
2PR = "r1"
3HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
4DESCRIPTION = "message bus system for applications to talk to one another"
5LICENSE = "GPL"
6DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
7 2
8SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ 3PR = "r2"
9 file://no-examples.patch;patch=1"
10
11inherit autotools pkgconfig gettext
12
13EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
14
15FILES_${PN} = "${libdir}/lib*.so.*"
16FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
17 4
18do_configure_prepend() { 5do_configure_prepend() {
19 install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ 6 install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
20} 7}
21 8
22do_stage () {
23 oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR}
24
25 autotools_stage_includes
26}
27
28FILES_${PN}-dev += "${bindir}/dbus-binding-tool"