From f0b6ce84826e63cd9c95e0427ee7890c454bc364 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 5 Jan 2009 17:21:56 +0000
Subject: dbus-glib: Factor into a common .inc file and cleanup the recipe
 using autotools staging

---
 .../dbus-glib-0.76/run-with-tmp-session-bus.patch  | 24 ++++++++++++++++++++++
 .../run-with-tmp-session-bus.patch                 | 24 ----------------------
 meta/packages/dbus/dbus-glib-native_0.76.bb        | 18 ++++++----------
 meta/packages/dbus/dbus-glib.inc                   | 17 +++++++++++++++
 meta/packages/dbus/dbus-glib_0.76.bb               | 24 ++--------------------
 5 files changed, 49 insertions(+), 58 deletions(-)
 create mode 100644 meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
 delete mode 100644 meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
 create mode 100644 meta/packages/dbus/dbus-glib.inc

(limited to 'meta')

diff --git a/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
new file mode 100644
index 000000000..a04f404f7
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
@@ -0,0 +1,24 @@
+Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
+===================================================================
+--- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh	2008-06-13 16:31:54.000000000 +0100
++++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh	2008-06-13 16:32:54.000000000 +0100
+@@ -30,17 +30,15 @@
+ echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
+ 
+ ## create a configuration file based on the standard session.conf
+-cat $DBUS_TOP_SRCDIR/tools/session.conf |  \
++cat $datadir/tools/session.conf |  \
+     sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' |  \
+     sed -e 's/<include.*$//g'                \
+   > $CONFIG_FILE
+ 
+ echo "Created configuration file $CONFIG_FILE" >&2
+ 
+-PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
+-export PATH
+ ## the libtool script found by the path search should already do this, but
+-LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
++LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+ export PATH
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DBUS_SESSION_BUS_PID
diff --git a/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
deleted file mode 100644
index a04f404f7..000000000
--- a/meta/packages/dbus/dbus-glib-native-0.76/run-with-tmp-session-bus.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
-===================================================================
---- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh	2008-06-13 16:31:54.000000000 +0100
-+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh	2008-06-13 16:32:54.000000000 +0100
-@@ -30,17 +30,15 @@
- echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
- 
- ## create a configuration file based on the standard session.conf
--cat $DBUS_TOP_SRCDIR/tools/session.conf |  \
-+cat $datadir/tools/session.conf |  \
-     sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' |  \
-     sed -e 's/<include.*$//g'                \
-   > $CONFIG_FILE
- 
- echo "Created configuration file $CONFIG_FILE" >&2
- 
--PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
--export PATH
- ## the libtool script found by the path search should already do this, but
--LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
-+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
- export PATH
- unset DBUS_SESSION_BUS_ADDRESS
- unset DBUS_SESSION_BUS_PID
diff --git a/meta/packages/dbus/dbus-glib-native_0.76.bb b/meta/packages/dbus/dbus-glib-native_0.76.bb
index 9486a3ed3..f3bd5ab13 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 000000000..30ad99c7c
--- /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 c69420e46..172aad63a 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"
-- 
cgit v1.2.3