summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-08-23 06:13:10 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-24 16:32:55 (GMT)
commitb9cf3bdb479ce06c788215f2ed8bf38475a62f45 (patch)
treec31047d885e7bb084a8fdf728c9c0c3ace8ccb2e /meta/recipes-connectivity
parent3ea34e035a2cd32e2aa64659c1171dda9d44025d (diff)
downloadpoky-b9cf3bdb479ce06c788215f2ed8bf38475a62f45.tar.gz
telepathy-glib: update to 0.19.6
The 0001-Fix-a-race-in-_gen-reentrant-methods.list patch is included in the 0.19.6 version. (From OE-Core rev: 712c365bf745de3fe927fcc24da505009d17a3e5) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch42
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-glib_0.19.6.bb (renamed from meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb)9
2 files changed, 4 insertions, 47 deletions
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch b/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
deleted file mode 100644
index 4f8ed2b..0000000
--- a/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 8ff62dc34961e997fb0224517aef0f12d455a82b Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Wed, 25 Jul 2012 12:58:16 +0100
4Subject: [PATCH] Fix a race in _gen/reentrant-methods.list
5
6Very occasionally, a parallel build will fail like this:
7
8| Making all in telepathy-glib
9| make[2]: Entering directory `/buildarea1/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/telepathy-glib-0.19.2-r0/telepathy-glib-0.19.2/telepathy-glib'
10| /bin/mkdir -p _gen
11| ( cd . && cat versions/0.7.0.abi [...] versions/0.19.2.abi ) | \
12| /bin/grep '^tp_cli_.*_run_.*' > _gen/reentrant-methods.list.tmp
13| /bin/sh: line 1: _gen/reentrant-methods.list.tmp: No such file or directory
14| make[2]: *** [_gen/reentrant-methods.list] Error 1
15
16It's doing the mkdir and the subshell in parallel, when the mkdir should be done
17first. Add an explicit dependency on spec-stamp to reentrant-methods.list to
18ensure the ordering.
19
20https://bugs.freedesktop.org/show_bug.cgi?id=52480
21
22Upstream-Status: Submitted
23---
24 telepathy-glib/codegen.am | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
28index 26caaef..6ad3ec5 100644
29--- a/telepathy-glib/codegen.am
30+++ b/telepathy-glib/codegen.am
31@@ -149,7 +149,7 @@ _gen/stable-spec.xml: stable-interfaces.xml _gen/stable-stamp $(tools_dir)/xincl
32 # Grab a list of re-entrant tp_cli_*_run_* methods we are committed to
33 # generating for backwards compatibility.
34 # grep --no-filename is not portable :-(
35-_gen/reentrant-methods.list: $(ABI_LISTS) codegen.am
36+_gen/reentrant-methods.list: _gen/spec-stamp $(ABI_LISTS) codegen.am
37 $(AM_V_GEN)( cd $(srcdir) && cat $(ABI_LISTS) ) | \
38 $(GREP) '^tp_cli_.*_run_.*' > $@.tmp
39 @mv $@.tmp $@
40--
411.7.10.4
42
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.6.bb
index 9dbc5be..37be67c 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.6.bb
@@ -3,13 +3,12 @@ DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection man
3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" 3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
4DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib" 4DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
5LICENSE = "LGPLv2.1+" 5LICENSE = "LGPLv2.1+"
6PR = "r1" 6PR = "r0"
7 7
8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz \ 8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
9 file://0001-Fix-a-race-in-_gen-reentrant-methods.list.patch"
10 9
11SRC_URI[md5sum] = "af2b33c1215f189e637bd59cc9139255" 10SRC_URI[md5sum] = "5fa6ecdb3f2b2a18d9a707e5d09fa8c7"
12SRC_URI[sha256sum] = "7e3c313ed08e26339deb603a615cec62a370131075514439f79f473f92ab84c3" 11SRC_URI[sha256sum] = "9fdb1260f4df7a89ff5245ffa72c0331f77affd2cd58cca3714bcfaa5bf473a8"
13 12
14LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e" 13LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
15 14