dbus-glib: Factor into a common .inc file and cleanup the recipe using autotools staging

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 @@
-SECTION = "base"
-PR = "r1"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://run-with-tmp-session-bus.patch;patch=1"
-
-inherit autotools pkgconfig gettext native
+require dbus-glib.inc
+inherit native
 
 DEPENDS = "glib-2.0-native dbus-native"
 
-EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
+PR = "r2"
+
+SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1"
 
 do_stage() {
-        oe_runmake install
+        autotools_stage_all
         install -d ${STAGING_DATADIR}/dbus
         install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
 }
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 @@
+SECTION = "base"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+           file://no-examples.patch;patch=1"
+
+inherit autotools_stage pkgconfig gettext
+
+EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
+
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 @@
-SECTION = "base"
-PR = "r1"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
-LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+require dbus-glib.inc
 
-SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
-	   file://no-examples.patch;patch=1"
-
-inherit autotools pkgconfig gettext
-
-EXTRA_OECONF = "--with-introspect=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+PR = "r2"
 
 do_configure_prepend() {
 	install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
 }
 
-do_stage () {
-	oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-}
-
-FILES_${PN}-dev += "${bindir}/dbus-binding-tool"