summaryrefslogtreecommitdiffstats
path: root/meta/packages/dbus
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-17 22:06:40 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-17 22:06:40 +0000
commitbf9725eb93c0dca478a7028e9ce620be06a7b0dd (patch)
tree1a44baada12c5c11e72389e2179a6cfd3b739786 /meta/packages/dbus
parentbe033d2d0b88f7a177efa3fb0db791175791a40e (diff)
downloadpoky-bf9725eb93c0dca478a7028e9ce620be06a7b0dd.tar.gz
dbus-native: Convert to use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/dbus')
-rw-r--r--meta/packages/dbus/dbus-native_1.2.14.bb16
-rw-r--r--meta/packages/dbus/dbus-native_1.2.4.bb18
2 files changed, 11 insertions, 23 deletions
diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb
index 0c6f5815f8..8114cd795b 100644
--- a/meta/packages/dbus/dbus-native_1.2.14.bb
+++ b/meta/packages/dbus/dbus-native_1.2.14.bb
@@ -7,20 +7,14 @@ PR = "r6"
7 7
8EXTRA_OECONF_X = "--without-x" 8EXTRA_OECONF_X = "--without-x"
9 9
10do_stage() { 10do_install() {
11 oe_runmake install 11 autotools_do_install
12 autotools_stage_all
13 12
14 # for dbus-glib-native introspection generation 13 # for dbus-glib-native introspection generation
15 install -d ${STAGING_DATADIR}/dbus 14 install -d ${D}${datadir}/dbus/
16 install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf 15 install -m 0644 bus/session.conf ${D}${datadir}/dbus/session.conf
17 16
18 # dbus-glib-native and dbus-glib need this xml file 17 # dbus-glib-native and dbus-glib need this xml file
19 install -d ${STAGING_DATADIR_NATIVE}/dbus/
20 cd ${S} 18 cd ${S}
21 ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml 19 ./bus/dbus-daemon --introspect > ${D}${datadir}/dbus/dbus-bus-introspect.xml
22}
23
24do_install() {
25 :
26} 20}
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 0c6f5815f8..3b750f9e8d 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,24 +3,18 @@ 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 = "r6" 6PR = "r7"
7 7
8EXTRA_OECONF_X = "--without-x" 8EXTRA_OECONF_X = "--without-x"
9 9
10do_stage() { 10do_install() {
11 oe_runmake install 11 autotools_do_install
12 autotools_stage_all
13 12
14 # for dbus-glib-native introspection generation 13 # for dbus-glib-native introspection generation
15 install -d ${STAGING_DATADIR}/dbus 14 install -d ${D}${datadir}/dbus/
16 install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf 15 install -m 0644 bus/session.conf ${D}${datadir}/dbus/session.conf
17 16
18 # dbus-glib-native and dbus-glib need this xml file 17 # dbus-glib-native and dbus-glib need this xml file
19 install -d ${STAGING_DATADIR_NATIVE}/dbus/
20 cd ${S} 18 cd ${S}
21 ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml 19 ./bus/dbus-daemon --introspect > ${D}${datadir}/dbus/dbus-bus-introspect.xml
22}
23
24do_install() {
25 :
26} 20}