summaryrefslogtreecommitdiff
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
parentbe033d2d0b88f7a177efa3fb0db791175791a40e (diff)
downloadopenembedded-core-bf9725eb93c0dca478a7028e9ce620be06a7b0dd.tar.gz
openembedded-core-bf9725eb93c0dca478a7028e9ce620be06a7b0dd.tar.bz2
openembedded-core-bf9725eb93c0dca478a7028e9ce620be06a7b0dd.tar.xz
openembedded-core-bf9725eb93c0dca478a7028e9ce620be06a7b0dd.zip
dbus-native: Convert to use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-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 0c6f5815f..8114cd795 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"
EXTRA_OECONF_X = "--without-x"
-do_stage() {
- oe_runmake install
- autotools_stage_all
+do_install() {
+ autotools_do_install
# for dbus-glib-native introspection generation
- install -d ${STAGING_DATADIR}/dbus
- install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+ install -d ${D}${datadir}/dbus/
+ install -m 0644 bus/session.conf ${D}${datadir}/dbus/session.conf
# dbus-glib-native and dbus-glib need this xml file
- install -d ${STAGING_DATADIR_NATIVE}/dbus/
cd ${S}
- ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
-}
-
-do_install() {
- :
+ ./bus/dbus-daemon --introspect > ${D}${datadir}/dbus/dbus-bus-introspect.xml
}
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 0c6f5815f..3b750f9e8 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
DEPENDS = "glib-2.0-native libxml2-native expat-native"
-PR = "r6"
+PR = "r7"
EXTRA_OECONF_X = "--without-x"
-do_stage() {
- oe_runmake install
- autotools_stage_all
+do_install() {
+ autotools_do_install
# for dbus-glib-native introspection generation
- install -d ${STAGING_DATADIR}/dbus
- install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+ install -d ${D}${datadir}/dbus/
+ install -m 0644 bus/session.conf ${D}${datadir}/dbus/session.conf
# dbus-glib-native and dbus-glib need this xml file
- install -d ${STAGING_DATADIR_NATIVE}/dbus/
cd ${S}
- ./bus/dbus-daemon --introspect > ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml
-}
-
-do_install() {
- :
+ ./bus/dbus-daemon --introspect > ${D}${datadir}/dbus/dbus-bus-introspect.xml
}