* [V3 1/2] bluez4: Install the test script
@ 2013-11-19 9:18 hongbo zhong
2013-11-19 9:19 ` [V3 2/2] bluez4: use legacy pygobject instead of gobject-introspection hongbo zhong
2013-12-11 2:04 ` [V3 1/2] bluez4: Install the test script Saul Wold
0 siblings, 2 replies; 3+ messages in thread
From: hongbo zhong @ 2013-11-19 9:18 UTC (permalink / raw)
To: openembedded-core
From: Zhong Hongbo <hongbo.zhong@windriver.com>
Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
---
.../bluez/bluez4-4.101/install-test-script.patch | 26 ++++++++++++++++++++
meta/recipes-connectivity/bluez/bluez4_4.101.bb | 6 ++++-
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
new file mode 100644
index 0000000..23f7d99
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Inappropriate
+
+Install the bluez's test scripts
+
+Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
+diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools
+--- bluez-4.101.orig/Makefile.tools 2013-11-19 15:49:07.688838000 +0800
++++ bluez-4.101/Makefile.tools 2013-11-19 15:50:09.256837848 +0800
+@@ -227,6 +227,17 @@
+ test/service-spp.xml test/service-opp.xml test/service-ftp.xml \
+ test/simple-player test/test-nap
+
++bluez4_testdir = $(libdir)/bluez4/test/
++dist_bluez4_test_SCRIPTS = test/sap-client test/hsplay test/hsmicro \
++ test/monitor-bluetooth test/list-devices \
++ test/test-discovery test/test-manager test/test-adapter \
++ test/test-device test/test-service test/test-serial \
++ test/test-telephony test/test-network test/simple-agent \
++ test/simple-service test/simple-endpoint test/test-audio \
++ test/test-input test/test-sap-server test/test-oob \
++ test/test-attrib test/test-proximity test/test-thermometer \
++ test/test-serial-proxy test/test-health test/test-health-sink \
++ test/simple-player test/test-nap
+ if HIDD
+ bin_PROGRAMS += compat/hidd
+
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index d6c3e26..7127619 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -7,6 +7,7 @@ SRC_URI += "file://bluetooth.conf \
file://fix-udev-paths.patch \
file://obsolete_automake_macros.patch \
file://network-fix-network-Connect-method-parameters.patch \
+ file://install-test-script.patch \
"
SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
@@ -23,9 +24,10 @@ do_install_append() {
}
RDEPENDS_${PN}-dev = "bluez-hcidump"
+RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez"
+PACKAGES =+ "libasound-module-bluez ${PN}-testtools"
FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
@@ -34,6 +36,8 @@ FILES_${PN}-dev += "\
${libdir}/alsa-lib/*.la \
"
+FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
+
FILES_${PN}-dbg += "\
${libdir}/bluetooth/plugins/.debug \
${libdir}/*/.debug \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* [V3 2/2] bluez4: use legacy pygobject instead of gobject-introspection
2013-11-19 9:18 [V3 1/2] bluez4: Install the test script hongbo zhong
@ 2013-11-19 9:19 ` hongbo zhong
2013-12-11 2:04 ` [V3 1/2] bluez4: Install the test script Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: hongbo zhong @ 2013-11-19 9:19 UTC (permalink / raw)
To: openembedded-core
From: Zhong Hongbo <hongbo.zhong@windriver.com>
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.
Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
---
...pygobject-instead-ofgobject-introspection.patch | 27 ++++++++++++++++++++
meta/recipes-connectivity/bluez/bluez4_4.101.bb | 1 +
2 files changed, 28 insertions(+)
create mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
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 0000000..37037f5
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
@@ -0,0 +1,27 @@
+Upstream-Status: Inappropriate
+
+use legacy pygobject instead of gobject-introspection
+
+Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
+---
+diff -Nurd bluez-4.101.orig/test/simple-agent bluez-4.101/test/simple-agent
+--- bluez-4.101.orig/test/simple-agent 2013-11-13 17:14:08.138118159 +0800
++++ bluez-4.101/test/simple-agent 2013-11-13 17:14:29.034118107 +0800
+@@ -2,7 +2,7 @@
+
+ from __future__ import absolute_import, print_function, unicode_literals
+
+-from gi.repository import GObject
++import gobject
+
+ import sys
+ import dbus
+@@ -122,7 +122,7 @@
+ path = "/test/agent"
+ agent = Agent(bus, path)
+
+- mainloop = GObject.MainLoop()
++ mainloop = gobject.MainLoop()
+
+ if len(args) > 1:
+ 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 7127619..543f854 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 \
file://obsolete_automake_macros.patch \
file://network-fix-network-Connect-method-parameters.patch \
file://install-test-script.patch \
+ file://use-legacy-pygobject-instead-ofgobject-introspection.patch \
"
SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [V3 1/2] bluez4: Install the test script
2013-11-19 9:18 [V3 1/2] bluez4: Install the test script hongbo zhong
2013-11-19 9:19 ` [V3 2/2] bluez4: use legacy pygobject instead of gobject-introspection hongbo zhong
@ 2013-12-11 2:04 ` Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2013-12-11 2:04 UTC (permalink / raw)
To: hongbo zhong, openembedded-core
On 11/19/2013 01:18 AM, hongbo zhong wrote:
> From: Zhong Hongbo <hongbo.zhong@windriver.com>
>
> Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
> ---
> .../bluez/bluez4-4.101/install-test-script.patch | 26 ++++++++++++++++++++
> meta/recipes-connectivity/bluez/bluez4_4.101.bb | 6 ++++-
> 2 files changed, 31 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
>
> diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
> new file mode 100644
> index 0000000..23f7d99
> --- /dev/null
> +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
> @@ -0,0 +1,26 @@
> +Upstream-Status: Inappropriate
> +
> +Install the bluez's test scripts
> +
> +Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
> +diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools
> +--- bluez-4.101.orig/Makefile.tools 2013-11-19 15:49:07.688838000 +0800
> ++++ bluez-4.101/Makefile.tools 2013-11-19 15:50:09.256837848 +0800
> +@@ -227,6 +227,17 @@
> + test/service-spp.xml test/service-opp.xml test/service-ftp.xml \
> + test/simple-player test/test-nap
> +
> ++bluez4_testdir = $(libdir)/bluez4/test/
> ++dist_bluez4_test_SCRIPTS = test/sap-client test/hsplay test/hsmicro \
> ++ test/monitor-bluetooth test/list-devices \
> ++ test/test-discovery test/test-manager test/test-adapter \
> ++ test/test-device test/test-service test/test-serial \
> ++ test/test-telephony test/test-network test/simple-agent \
> ++ test/simple-service test/simple-endpoint test/test-audio \
> ++ test/test-input test/test-sap-server test/test-oob \
> ++ test/test-attrib test/test-proximity test/test-thermometer \
> ++ test/test-serial-proxy test/test-health test/test-health-sink \
> ++ test/simple-player test/test-nap
> + if HIDD
> + bin_PROGRAMS += compat/hidd
> +
> diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
> index d6c3e26..7127619 100644
> --- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
> +++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
> @@ -7,6 +7,7 @@ SRC_URI += "file://bluetooth.conf \
> file://fix-udev-paths.patch \
> file://obsolete_automake_macros.patch \
> file://network-fix-network-Connect-method-parameters.patch \
> + file://install-test-script.patch \
> "
>
> SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
> @@ -23,9 +24,10 @@ do_install_append() {
> }
>
> RDEPENDS_${PN}-dev = "bluez-hcidump"
> +RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
>
> ALLOW_EMPTY_libasound-module-bluez = "1"
> -PACKAGES =+ "libasound-module-bluez"
> +PACKAGES =+ "libasound-module-bluez ${PN}-testtools"
>
I am not sure this will do the right thing, have you verified that the
testtools packages actually gets populated? I ask since this line will
add ${PN}-testtools after ${PN} and unless you excplictly override
FILES_${PN}, it will greedily grab the ${libdir}/${BPN}/* files which in
this case includes the test directory listed below.
Sau!
> FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
> FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1"
> @@ -34,6 +36,8 @@ FILES_${PN}-dev += "\
> ${libdir}/alsa-lib/*.la \
> "
>
> +FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
> +
> FILES_${PN}-dbg += "\
> ${libdir}/bluetooth/plugins/.debug \
> ${libdir}/*/.debug \
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-11 2:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-19 9:18 [V3 1/2] bluez4: Install the test script hongbo zhong
2013-11-19 9:19 ` [V3 2/2] bluez4: use legacy pygobject instead of gobject-introspection hongbo zhong
2013-12-11 2:04 ` [V3 1/2] bluez4: Install the test script Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.