diff options
author | Zhong Hongbo <hongbo.zhong@windriver.com> | 2013-11-19 17:19:00 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-18 11:21:27 +0000 |
commit | f773d90a467270c57292cfd3f12c0c539da4ab77 (patch) | |
tree | 114096c84c6fa5a3f49048c4cc6b955d606b9998 | |
parent | 8e21e3e089506447ba3447ff6b939b0f4990c626 (diff) | |
download | poky-f773d90a467270c57292cfd3f12c0c539da4ab77.tar.gz |
bluez4: use legacy pygobject instead of gobject-introspection
pygobject-3.0 use GObject from gi.repository instead of
gobject modules. Since oe-core use pygobject-2.x, change
all of "from gi.repository import GObject" to
"import gobject" for bluez4.
(From OE-Core rev: 9976a860b495256d94ec44c5084b13f214351547)
Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch | 27 | ||||
-rw-r--r-- | meta/recipes-connectivity/bluez/bluez4_4.101.bb | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch new file mode 100644 index 0000000000..37037f52e3 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | use legacy pygobject instead of gobject-introspection | ||
4 | |||
5 | Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com> | ||
6 | --- | ||
7 | diff -Nurd bluez-4.101.orig/test/simple-agent bluez-4.101/test/simple-agent | ||
8 | --- bluez-4.101.orig/test/simple-agent 2013-11-13 17:14:08.138118159 +0800 | ||
9 | +++ bluez-4.101/test/simple-agent 2013-11-13 17:14:29.034118107 +0800 | ||
10 | @@ -2,7 +2,7 @@ | ||
11 | |||
12 | from __future__ import absolute_import, print_function, unicode_literals | ||
13 | |||
14 | -from gi.repository import GObject | ||
15 | +import gobject | ||
16 | |||
17 | import sys | ||
18 | import dbus | ||
19 | @@ -122,7 +122,7 @@ | ||
20 | path = "/test/agent" | ||
21 | agent = Agent(bus, path) | ||
22 | |||
23 | - mainloop = GObject.MainLoop() | ||
24 | + mainloop = gobject.MainLoop() | ||
25 | |||
26 | if len(args) > 1: | ||
27 | if len(args) > 2: | ||
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb index 7127619ddf..543f854095 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb | |||
@@ -8,6 +8,7 @@ SRC_URI += "file://bluetooth.conf \ | |||
8 | file://obsolete_automake_macros.patch \ | 8 | file://obsolete_automake_macros.patch \ |
9 | file://network-fix-network-Connect-method-parameters.patch \ | 9 | file://network-fix-network-Connect-method-parameters.patch \ |
10 | file://install-test-script.patch \ | 10 | file://install-test-script.patch \ |
11 | file://use-legacy-pygobject-instead-ofgobject-introspection.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" | 14 | SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" |