summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhong Hongbo <hongbo.zhong@windriver.com>2013-11-19 17:18:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-18 11:21:26 +0000
commit8e21e3e089506447ba3447ff6b939b0f4990c626 (patch)
tree3c97b8890269bb4a20d97d7446375d2a3cae8069 /meta
parent62849984b5a92f08438ca3b770dae122285e6ca8 (diff)
downloadpoky-8e21e3e089506447ba3447ff6b939b0f4990c626.tar.gz
bluez4: Install the test script
(From OE-Core rev: c55918d73318fb86af122529bf1034826268356b) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch26
-rw-r--r--meta/recipes-connectivity/bluez/bluez4_4.101.bb6
2 files changed, 31 insertions, 1 deletions
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 0000000000..23f7d999b3
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
@@ -0,0 +1,26 @@
1Upstream-Status: Inappropriate
2
3Install the bluez's test scripts
4
5Signed-off-by: Zhong Hongbo <hongbo.zhong@windriver.com>
6diff -Nurd bluez-4.101.orig/Makefile.tools bluez-4.101/Makefile.tools
7--- bluez-4.101.orig/Makefile.tools 2013-11-19 15:49:07.688838000 +0800
8+++ bluez-4.101/Makefile.tools 2013-11-19 15:50:09.256837848 +0800
9@@ -227,6 +227,17 @@
10 test/service-spp.xml test/service-opp.xml test/service-ftp.xml \
11 test/simple-player test/test-nap
12
13+bluez4_testdir = $(libdir)/bluez4/test/
14+dist_bluez4_test_SCRIPTS = test/sap-client test/hsplay test/hsmicro \
15+ test/monitor-bluetooth test/list-devices \
16+ test/test-discovery test/test-manager test/test-adapter \
17+ test/test-device test/test-service test/test-serial \
18+ test/test-telephony test/test-network test/simple-agent \
19+ test/simple-service test/simple-endpoint test/test-audio \
20+ test/test-input test/test-sap-server test/test-oob \
21+ test/test-attrib test/test-proximity test/test-thermometer \
22+ test/test-serial-proxy test/test-health test/test-health-sink \
23+ test/simple-player test/test-nap
24 if HIDD
25 bin_PROGRAMS += compat/hidd
26
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index d6c3e261f6..7127619ddf 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 \
7 file://fix-udev-paths.patch \ 7 file://fix-udev-paths.patch \
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" 11"
11 12
12SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad" 13SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
@@ -23,9 +24,10 @@ do_install_append() {
23} 24}
24 25
25RDEPENDS_${PN}-dev = "bluez-hcidump" 26RDEPENDS_${PN}-dev = "bluez-hcidump"
27RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
26 28
27ALLOW_EMPTY_libasound-module-bluez = "1" 29ALLOW_EMPTY_libasound-module-bluez = "1"
28PACKAGES =+ "libasound-module-bluez" 30PACKAGES =+ "libasound-module-bluez ${PN}-testtools"
29 31
30FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" 32FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
31FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" 33FILES_${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 += "\
34 ${libdir}/alsa-lib/*.la \ 36 ${libdir}/alsa-lib/*.la \
35" 37"
36 38
39FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
40
37FILES_${PN}-dbg += "\ 41FILES_${PN}-dbg += "\
38 ${libdir}/bluetooth/plugins/.debug \ 42 ${libdir}/bluetooth/plugins/.debug \
39 ${libdir}/*/.debug \ 43 ${libdir}/*/.debug \