* [V2 1/2] bluez4: Install the test script
@ 2013-11-15 6:52 Zhong Hongbo
2013-11-15 6:52 ` [V2 2/2] bluez4: use legacy pygobject instead of gobject-introspection Zhong Hongbo
2013-11-15 17:03 ` [V2 1/2] bluez4: Install the test script Saul Wold
0 siblings, 2 replies; 5+ messages in thread
From: Zhong Hongbo @ 2013-11-15 6:52 UTC (permalink / raw)
To: openembedded-core
From: Zhong Hongbo <hongbo.zhong@windriver.com>
In defalut, the bluez-test script do not be installed in the rootfs.
After the user enable ptest feature, it will be install.
Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
---
.../bluez/bluez4-4.101/install-test-script.patch | 42 ++++++++++++++++++++
meta/recipes-connectivity/bluez/bluez4_4.101.bb | 13 +++++-
2 files changed, 54 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..bd7f31d
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
@@ -0,0 +1,42 @@
+Upstream-Status: Inappropriate
+
+Install the test scripts to /usr/bin directory
+
+Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
+---
+diff -Nurd bluez-4.101.orig/configure.ac bluez-4.101/configure.ac
+--- bluez-4.101.orig/configure.ac 2013-11-14 17:11:28.249903077 +0800
++++ bluez-4.101/configure.ac 2013-11-14 17:17:18.089902204 +0800
+@@ -61,6 +61,11 @@
+ fi
+ AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
+
++AC_ARG_WITH([bluez4testdir],
++ AS_HELP_STRING([--with-bluez4testdir=DIR], [bluez4 script test directory]),
++ [], [with_bluez4testdir=/usr/bin/])
++AC_SUBST([BLUEZ4_TEST_DIR], [$with_bluez4testdir])
++
+ AC_ARG_WITH([udevdir],
+ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
+ [], [with_udevdir=/lib/udev/])
+diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools
+--- bluez-4.101.orig/Makefile.tools 2013-11-14 17:11:28.237903079 +0800
++++ bluez-4.101/Makefile.tools 2013-11-14 17:18:11.577902071 +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 = @BLUEZ4_TEST_DIR@
++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..e61ba02 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"
@@ -25,7 +26,7 @@ do_install_append() {
RDEPENDS_${PN}-dev = "bluez-hcidump"
ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez"
+PACKAGES =+ "libasound-module-bluez ${PN}-test"
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 +35,16 @@ FILES_${PN}-dev += "\
${libdir}/alsa-lib/*.la \
"
+RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-test', '', d)}"
+FILES_${PN}-test += "\
+ ${bindir}/test-* \
+ ${bindir}/simple-* \
+ ${bindir}/hsmicro \
+ ${bindir}/hsplay \
+ ${bindir}/list-devices \
+ ${bindir}/monitor-bluetooth \
+"
+
FILES_${PN}-dbg += "\
${libdir}/bluetooth/plugins/.debug \
${libdir}/*/.debug \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [V2 2/2] bluez4: use legacy pygobject instead of gobject-introspection
2013-11-15 6:52 [V2 1/2] bluez4: Install the test script Zhong Hongbo
@ 2013-11-15 6:52 ` Zhong Hongbo
2013-11-15 15:08 ` Chris Larson
2013-11-15 17:03 ` [V2 1/2] bluez4: Install the test script Saul Wold
1 sibling, 1 reply; 5+ messages in thread
From: Zhong Hongbo @ 2013-11-15 6:52 UTC (permalink / raw)
To: openembedded-core
From: Zhong Hongbo <hongbo.zhong@windriver.com>
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 e61ba02..ba80d5a 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] 5+ messages in thread
* Re: [V2 2/2] bluez4: use legacy pygobject instead of gobject-introspection
2013-11-15 6:52 ` [V2 2/2] bluez4: use legacy pygobject instead of gobject-introspection Zhong Hongbo
@ 2013-11-15 15:08 ` Chris Larson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Larson @ 2013-11-15 15:08 UTC (permalink / raw)
To: Zhong Hongbo; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 378 bytes --]
On Thu, Nov 14, 2013 at 11:52 PM, Zhong Hongbo
<hongbo.zhong@windriver.com>wrote:
> From: Zhong Hongbo <hongbo.zhong@windriver.com>
>
This seems like a good example of a commit message missing the “why”.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 796 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [V2 1/2] bluez4: Install the test script
2013-11-15 6:52 [V2 1/2] bluez4: Install the test script Zhong Hongbo
2013-11-15 6:52 ` [V2 2/2] bluez4: use legacy pygobject instead of gobject-introspection Zhong Hongbo
@ 2013-11-15 17:03 ` Saul Wold
2013-11-15 22:59 ` Burton, Ross
1 sibling, 1 reply; 5+ messages in thread
From: Saul Wold @ 2013-11-15 17:03 UTC (permalink / raw)
To: Zhong Hongbo, openembedded-core
On 11/14/2013 10:52 PM, Zhong Hongbo wrote:
> From: Zhong Hongbo <hongbo.zhong@windriver.com>
>
> In defalut, the bluez-test script do not be installed in the rootfs.
> After the user enable ptest feature, it will be install.
>
I think these tests are not the same as ptest, I think these are more
like testapps, so I am not sure using ptest as a PACKAGECONFIG is correct.
They could be packaged as testtools similar to bluez5 and installed with
packagegroup-core-tools-testapps,
Sau!
> Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
> ---
> .../bluez/bluez4-4.101/install-test-script.patch | 42 ++++++++++++++++++++
> meta/recipes-connectivity/bluez/bluez4_4.101.bb | 13 +++++-
> 2 files changed, 54 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..bd7f31d
> --- /dev/null
> +++ b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
> @@ -0,0 +1,42 @@
> +Upstream-Status: Inappropriate
> +
> +Install the test scripts to /usr/bin directory
> +
> +Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
> +---
> +diff -Nurd bluez-4.101.orig/configure.ac bluez-4.101/configure.ac
> +--- bluez-4.101.orig/configure.ac 2013-11-14 17:11:28.249903077 +0800
> ++++ bluez-4.101/configure.ac 2013-11-14 17:17:18.089902204 +0800
> +@@ -61,6 +61,11 @@
> + fi
> + AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
> +
> ++AC_ARG_WITH([bluez4testdir],
> ++ AS_HELP_STRING([--with-bluez4testdir=DIR], [bluez4 script test directory]),
> ++ [], [with_bluez4testdir=/usr/bin/])
> ++AC_SUBST([BLUEZ4_TEST_DIR], [$with_bluez4testdir])
> ++
> + AC_ARG_WITH([udevdir],
> + AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
> + [], [with_udevdir=/lib/udev/])
> +diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools
> +--- bluez-4.101.orig/Makefile.tools 2013-11-14 17:11:28.237903079 +0800
> ++++ bluez-4.101/Makefile.tools 2013-11-14 17:18:11.577902071 +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 = @BLUEZ4_TEST_DIR@
> ++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..e61ba02 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"
> @@ -25,7 +26,7 @@ do_install_append() {
> RDEPENDS_${PN}-dev = "bluez-hcidump"
>
> ALLOW_EMPTY_libasound-module-bluez = "1"
> -PACKAGES =+ "libasound-module-bluez"
> +PACKAGES =+ "libasound-module-bluez ${PN}-test"
>
> 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 +35,16 @@ FILES_${PN}-dev += "\
> ${libdir}/alsa-lib/*.la \
> "
>
> +RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-test', '', d)}"
> +FILES_${PN}-test += "\
> + ${bindir}/test-* \
> + ${bindir}/simple-* \
> + ${bindir}/hsmicro \
> + ${bindir}/hsplay \
> + ${bindir}/list-devices \
> + ${bindir}/monitor-bluetooth \
> +"
> +
> FILES_${PN}-dbg += "\
> ${libdir}/bluetooth/plugins/.debug \
> ${libdir}/*/.debug \
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [V2 1/2] bluez4: Install the test script
2013-11-15 17:03 ` [V2 1/2] bluez4: Install the test script Saul Wold
@ 2013-11-15 22:59 ` Burton, Ross
0 siblings, 0 replies; 5+ messages in thread
From: Burton, Ross @ 2013-11-15 22:59 UTC (permalink / raw)
To: Saul Wold; +Cc: OE-core
On 15 November 2013 17:03, Saul Wold <sgw@linux.intel.com> wrote:
> I think these tests are not the same as ptest, I think these are more like
> testapps, so I am not sure using ptest as a PACKAGECONFIG is correct.
Correct, respecting ptest here is entirely wrong.
> They could be packaged as testtools similar to bluez5 and installed with
> packagegroup-core-tools-testapps,
Yes, that would be very useful.
Ross
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-11-15 23:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-15 6:52 [V2 1/2] bluez4: Install the test script Zhong Hongbo
2013-11-15 6:52 ` [V2 2/2] bluez4: use legacy pygobject instead of gobject-introspection Zhong Hongbo
2013-11-15 15:08 ` Chris Larson
2013-11-15 17:03 ` [V2 1/2] bluez4: Install the test script Saul Wold
2013-11-15 22:59 ` Burton, Ross
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.