* [meta-oe][PATCH] bluez collection: add (moved from oe-core)
@ 2015-04-03 14:16 Cristian Iorga
2015-04-03 17:45 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Cristian Iorga @ 2015-04-03 14:16 UTC (permalink / raw)
To: openembedded-devel
BlueZ 4.x Bluetooth stack has been removed from oe-core.
However, it is still supported, so add it to
meta-oe networking layer.
In order to use it in oe-core/poky/YP 'bluez4' needs to
be added to distro features. 'bluetooth' distro feature
needs to be present also.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
.../obsolete_automake_macros.patch | 14 +++++++
.../bluez/bluez-hcidump_2.5.bb | 22 +++++++++++
.../bluez/bluez4-4.101/bluetooth.conf | 16 ++++++++
.../bluez/bluez4-4.101/fix-udev-paths.patch | 37 +++++++++++++++++
.../bluez/bluez4-4.101/install-test-script.patch | 26 ++++++++++++
...ork-fix-network-Connect-method-parameters.patch | 30 ++++++++++++++
.../bluez4-4.101/obsolete_automake_macros.patch | 14 +++++++
.../bluez/bluez4-4.101/sbc_mmx.patch | 24 +++++++++++
...pygobject-instead-ofgobject-introspection.patch | 27 +++++++++++++
meta-oe/recipes-connectivity/bluez/bluez4.inc | 46 ++++++++++++++++++++++
meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb | 46 ++++++++++++++++++++++
.../bluez/gst-plugin-bluetooth_4.101.bb | 39 ++++++++++++++++++
12 files changed, 341 insertions(+)
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4.inc
create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
create mode 100644 meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch
new file mode 100644
index 0000000..0c77f1a
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Pending [package obsolete/not maintained by upstream]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac
+--- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200
++++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200
+@@ -2,7 +2,7 @@
+ AC_INIT(bluez-hcidump, 2.5)
+
+ AM_INIT_AUTOMAKE([foreign subdir-objects])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
new file mode 100644
index 0000000..3950630
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool"
+DESCRIPTION = "The hcidump tool reads raw HCI data coming from and going to a Bluetooth device \
+and displays the commands, events and data in a human-readable form."
+
+SECTION = "console"
+# hcidump was integrated into bluez5
+DEPENDS = "bluez4"
+RCONFLICTS_${PN} = "bluez5"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
+ file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
+PR = "r1"
+
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz \
+ file://obsolete_automake_macros.patch \
+"
+
+SRC_URI[md5sum] = "2eab54bbd2b59a2ed4274ebb9390cf18"
+SRC_URI[sha256sum] = "9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d88881"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+inherit autotools
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
new file mode 100644
index 0000000..ca5e9e4
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
@@ -0,0 +1,16 @@
+<!-- This configuration file specifies the required security policies
+ for Bluetooth core daemon to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+ <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+ <policy context="default">
+ <allow own="org.bluez"/>
+ <allow send_destination="org.bluez"/>
+ <allow send_interface="org.bluez.Agent"/>
+ </policy>
+
+</busconfig>
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
new file mode 100644
index 0000000..8089914
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
@@ -0,0 +1,37 @@
+Add udevdir/udevrulesdir options
+
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+Index: bluez-4.101/Makefile.am
+===================================================================
+--- bluez-4.101.orig/Makefile.am
++++ bluez-4.101/Makefile.am
+@@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf
+ include Makefile.tools
+
+ if DATAFILES
+-rulesdir = @UDEV_DIR@/rules.d
++rulesdir = @UDEV_RULES_DIR@
+
+ udev_files =
+
+Index: bluez-4.101/configure.ac
+===================================================================
+--- bluez-4.101.orig/configure.ac
++++ bluez-4.101/configure.ac
+@@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then
+ fi
+ AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
+
++AC_ARG_WITH([udevdir],
++ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
++ [], [with_udevdir=/lib/udev/])
++AC_SUBST([UDEV_DIR], [$with_udevdir])
++
++AC_ARG_WITH([udevrulesdir],
++ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]),
++ [], [with_udevrulesdir=/lib/udev/rules.d])
++AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir])
++
+ AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc)
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
new file mode 100644
index 0000000..23f7d99
--- /dev/null
+++ b/meta-oe/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-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
new file mode 100644
index 0000000..37f9199
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
@@ -0,0 +1,30 @@
+Upstream-Status: Backport
+Signed-off-by: Peter A. Bigot <pab@pabigot.com>
+
+From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001
+From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
+Date: Sat, 30 Jun 2012 00:39:05 -0300
+Subject: [PATCH] network: fix network Connect() method parameters
+
+---
+ network/connection.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/network/connection.c b/network/connection.c
+index 544ec3a..59423a9 100644
+--- a/network/connection.c
++++ b/network/connection.c
+@@ -554,7 +554,9 @@ static void path_unregister(void *data)
+
+ static const GDBusMethodTable connection_methods[] = {
+ { GDBUS_ASYNC_METHOD("Connect",
+- NULL, NULL, connection_connect) },
++ GDBUS_ARGS({"uuid", "s"}),
++ GDBUS_ARGS({"interface", "s"}),
++ connection_connect) },
+ { GDBUS_METHOD("Disconnect",
+ NULL, NULL, connection_disconnect) },
+ { GDBUS_METHOD("GetProperties",
+--
+1.7.9.5
+
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
new file mode 100644
index 0000000..1068f24
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Backport
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd bluez-4.101/configure.ac bluez-4.101/configure.ac
+--- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300
++++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200
+@@ -2,7 +2,7 @@
+ AC_INIT(bluez, 4.101)
+
+ AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
new file mode 100644
index 0000000..98fab45
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
@@ -0,0 +1,24 @@
+on x86 and x86_64 gcc 4.7 complains
+
+sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx':
+sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably doesn't match constraints [enabled by default]
+sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm'
+
+This patch is taken from https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: bluez-4.98/sbc/sbc_primitives_mmx.c
+===================================================================
+--- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800
++++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800
+@@ -318,7 +318,7 @@
+ "movl %k0, 4(%3)\n"
+ : "+r" (blk)
+ : "r" (&sb_sample_f[0][ch][sb]),
+- "i" ((char *) &sb_sample_f[1][0][0] -
++ "r" ((char *) &sb_sample_f[1][0][0] -
+ (char *) &sb_sample_f[0][0][0]),
+ "r" (&scale_factor[ch][sb]),
+ "r" (&consts),
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
new file mode 100644
index 0000000..37037f5
--- /dev/null
+++ b/meta-oe/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-oe/recipes-connectivity/bluez/bluez4.inc b/meta-oe/recipes-connectivity/bluez/bluez4.inc
new file mode 100644
index 0000000..11c9616
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4.inc
@@ -0,0 +1,46 @@
+SUMMARY = "Linux Bluetooth Stack Userland V4"
+DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries."
+HOMEPAGE = "http://www.bluez.org"
+SECTION = "libs"
+LICENSE = "GPLv2+ & LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
+ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
+ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
+ file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
+DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
+RDEPENDS_${PN}-dev = "bluez-hcidump"
+
+PACKAGECONFIG ??= "\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
+"
+PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
+PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
+
+ASNEEDED = ""
+
+SRC_URI = "\
+ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
+"
+S = "${WORKDIR}/bluez-${PV}"
+
+inherit autotools-brokensep pkgconfig
+
+EXTRA_OECONF = "\
+ --disable-gstreamer \
+ --enable-usb \
+ --enable-tools \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-dfutool \
+ --disable-hidd \
+ --disable-pand \
+ --disable-dund \
+ --disable-cups \
+ --enable-test \
+ --enable-datafiles \
+ --with-udevdir=`pkg-config --variable=udevdir udev` \
+ --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
+"
+
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
new file mode 100644
index 0000000..28a94ed
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -0,0 +1,46 @@
+require bluez4.inc
+
+PR = "r11"
+
+SRC_URI += "file://bluetooth.conf \
+ file://sbc_mmx.patch \
+ file://fix-udev-paths.patch \
+ 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"
+SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
+
+RCONFLICTS_${PN} = "bluez5"
+
+do_install_append() {
+ install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
+ install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
+ install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
+ # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
+ install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
+}
+
+RDEPENDS_${PN}-dev = "bluez-hcidump"
+RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
+
+ALLOW_EMPTY_libasound-module-bluez = "1"
+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"
+FILES_${PN}-dev += "\
+ ${libdir}/bluetooth/plugins/*.la \
+ ${libdir}/alsa-lib/*.la \
+"
+
+FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
+
+FILES_${PN}-dbg += "\
+ ${libdir}/bluetooth/plugins/.debug \
+ ${libdir}/*/.debug \
+ */udev/.debug \
+ "
diff --git a/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
new file mode 100644
index 0000000..c71d612
--- /dev/null
+++ b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
@@ -0,0 +1,39 @@
+require bluez4.inc
+require recipes-multimedia/gstreamer/gst-plugins-package.inc
+
+PR = "r1"
+
+SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
+SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
+
+DEPENDS = "bluez4 gst-plugins-base"
+
+EXTRA_OECONF = "\
+ --enable-gstreamer \
+"
+
+# clean unwanted files
+do_install_append() {
+ rm -rf ${D}${bindir}
+ rm -rf ${D}${sbindir}
+ rm -f ${D}${libdir}/lib*
+ rm -rf ${D}${libdir}/pkgconfig
+ rm -rf ${D}${sysconfdir}
+ rm -rf ${D}${base_libdir}
+ rm -rf ${D}${libdir}/bluetooth
+ rm -rf ${D}${localstatedir}
+ rm -rf ${D}${libdir}/alsa-lib
+ rm -rf ${D}${datadir}
+ rm -rf ${D}${includedir}
+ rm -rf ${D}${nonarch_base_libdir}
+}
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so"
+FILES_${PN}-dev += "\
+ ${libdir}/gstreamer-0.10/*.la \
+"
+
+FILES_${PN}-dbg += "\
+ ${libdir}/*/.debug \
+"
+
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] bluez collection: add (moved from oe-core)
2015-04-03 14:16 [meta-oe][PATCH] bluez collection: add (moved from oe-core) Cristian Iorga
@ 2015-04-03 17:45 ` Martin Jansa
2015-04-06 7:21 ` Iorga, Cristian
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2015-04-03 17:45 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 19690 bytes --]
On Fri, Apr 03, 2015 at 05:16:48PM +0300, Cristian Iorga wrote:
> BlueZ 4.x Bluetooth stack has been removed from oe-core.
> However, it is still supported, so add it to
> meta-oe networking layer.
"meta-oe netwrorking layer" is very confusing, did you plan to put it in meta-networking?
> In order to use it in oe-core/poky/YP 'bluez4' needs to
> be added to distro features. 'bluetooth' distro feature
> needs to be present also.
>
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> ---
> .../obsolete_automake_macros.patch | 14 +++++++
> .../bluez/bluez-hcidump_2.5.bb | 22 +++++++++++
> .../bluez/bluez4-4.101/bluetooth.conf | 16 ++++++++
> .../bluez/bluez4-4.101/fix-udev-paths.patch | 37 +++++++++++++++++
> .../bluez/bluez4-4.101/install-test-script.patch | 26 ++++++++++++
> ...ork-fix-network-Connect-method-parameters.patch | 30 ++++++++++++++
> .../bluez4-4.101/obsolete_automake_macros.patch | 14 +++++++
> .../bluez/bluez4-4.101/sbc_mmx.patch | 24 +++++++++++
> ...pygobject-instead-ofgobject-introspection.patch | 27 +++++++++++++
> meta-oe/recipes-connectivity/bluez/bluez4.inc | 46 ++++++++++++++++++++++
> meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb | 46 ++++++++++++++++++++++
> .../bluez/gst-plugin-bluetooth_4.101.bb | 39 ++++++++++++++++++
> 12 files changed, 341 insertions(+)
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4.inc
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> create mode 100644 meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
>
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch
> new file mode 100644
> index 0000000..0c77f1a
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch
> @@ -0,0 +1,14 @@
> +Upstream-Status: Pending [package obsolete/not maintained by upstream]
> +
> +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> +diff -Nurd bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac
> +--- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200
> ++++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200
> +@@ -2,7 +2,7 @@
> + AC_INIT(bluez-hcidump, 2.5)
> +
> + AM_INIT_AUTOMAKE([foreign subdir-objects])
> +-AM_CONFIG_HEADER(config.h)
> ++AC_CONFIG_HEADERS(config.h)
> +
> + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> new file mode 100644
> index 0000000..3950630
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> @@ -0,0 +1,22 @@
> +SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool"
> +DESCRIPTION = "The hcidump tool reads raw HCI data coming from and going to a Bluetooth device \
> +and displays the commands, events and data in a human-readable form."
> +
> +SECTION = "console"
> +# hcidump was integrated into bluez5
> +DEPENDS = "bluez4"
> +RCONFLICTS_${PN} = "bluez5"
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
> + file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
> +PR = "r1"
> +
> +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz \
> + file://obsolete_automake_macros.patch \
> +"
> +
> +SRC_URI[md5sum] = "2eab54bbd2b59a2ed4274ebb9390cf18"
> +SRC_URI[sha256sum] = "9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d88881"
> +S = "${WORKDIR}/bluez-hcidump-${PV}"
> +
> +inherit autotools
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> new file mode 100644
> index 0000000..ca5e9e4
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> @@ -0,0 +1,16 @@
> +<!-- This configuration file specifies the required security policies
> + for Bluetooth core daemon to work. -->
> +
> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
> + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> +<busconfig>
> +
> + <!-- ../system.conf have denied everything, so we just punch some holes -->
> +
> + <policy context="default">
> + <allow own="org.bluez"/>
> + <allow send_destination="org.bluez"/>
> + <allow send_interface="org.bluez.Agent"/>
> + </policy>
> +
> +</busconfig>
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> new file mode 100644
> index 0000000..8089914
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> @@ -0,0 +1,37 @@
> +Add udevdir/udevrulesdir options
> +
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> +
> +Index: bluez-4.101/Makefile.am
> +===================================================================
> +--- bluez-4.101.orig/Makefile.am
> ++++ bluez-4.101/Makefile.am
> +@@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf
> + include Makefile.tools
> +
> + if DATAFILES
> +-rulesdir = @UDEV_DIR@/rules.d
> ++rulesdir = @UDEV_RULES_DIR@
> +
> + udev_files =
> +
> +Index: bluez-4.101/configure.ac
> +===================================================================
> +--- bluez-4.101.orig/configure.ac
> ++++ bluez-4.101/configure.ac
> +@@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then
> + fi
> + AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
> +
> ++AC_ARG_WITH([udevdir],
> ++ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
> ++ [], [with_udevdir=/lib/udev/])
> ++AC_SUBST([UDEV_DIR], [$with_udevdir])
> ++
> ++AC_ARG_WITH([udevrulesdir],
> ++ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]),
> ++ [], [with_udevrulesdir=/lib/udev/rules.d])
> ++AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir])
> ++
> + AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc)
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch
> new file mode 100644
> index 0000000..23f7d99
> --- /dev/null
> +++ b/meta-oe/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-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
> new file mode 100644
> index 0000000..37f9199
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
> @@ -0,0 +1,30 @@
> +Upstream-Status: Backport
> +Signed-off-by: Peter A. Bigot <pab@pabigot.com>
> +
> +From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001
> +From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> +Date: Sat, 30 Jun 2012 00:39:05 -0300
> +Subject: [PATCH] network: fix network Connect() method parameters
> +
> +---
> + network/connection.c | 4 +++-
> + 1 file changed, 3 insertions(+), 1 deletion(-)
> +
> +diff --git a/network/connection.c b/network/connection.c
> +index 544ec3a..59423a9 100644
> +--- a/network/connection.c
> ++++ b/network/connection.c
> +@@ -554,7 +554,9 @@ static void path_unregister(void *data)
> +
> + static const GDBusMethodTable connection_methods[] = {
> + { GDBUS_ASYNC_METHOD("Connect",
> +- NULL, NULL, connection_connect) },
> ++ GDBUS_ARGS({"uuid", "s"}),
> ++ GDBUS_ARGS({"interface", "s"}),
> ++ connection_connect) },
> + { GDBUS_METHOD("Disconnect",
> + NULL, NULL, connection_disconnect) },
> + { GDBUS_METHOD("GetProperties",
> +--
> +1.7.9.5
> +
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
> new file mode 100644
> index 0000000..1068f24
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch
> @@ -0,0 +1,14 @@
> +Upstream-Status: Backport
> +
> +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> +diff -Nurd bluez-4.101/configure.ac bluez-4.101/configure.ac
> +--- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300
> ++++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200
> +@@ -2,7 +2,7 @@
> + AC_INIT(bluez, 4.101)
> +
> + AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
> +-AM_CONFIG_HEADER(config.h)
> ++AC_CONFIG_HEADERS(config.h)
> +
> + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> new file mode 100644
> index 0000000..98fab45
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> @@ -0,0 +1,24 @@
> +on x86 and x86_64 gcc 4.7 complains
> +
> +sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx':
> +sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably doesn't match constraints [enabled by default]
> +sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm'
> +
> +This patch is taken from https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
> +Upstream-Status: Pending
> +Index: bluez-4.98/sbc/sbc_primitives_mmx.c
> +===================================================================
> +--- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800
> ++++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800
> +@@ -318,7 +318,7 @@
> + "movl %k0, 4(%3)\n"
> + : "+r" (blk)
> + : "r" (&sb_sample_f[0][ch][sb]),
> +- "i" ((char *) &sb_sample_f[1][0][0] -
> ++ "r" ((char *) &sb_sample_f[1][0][0] -
> + (char *) &sb_sample_f[0][0][0]),
> + "r" (&scale_factor[ch][sb]),
> + "r" (&consts),
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch
> new file mode 100644
> index 0000000..37037f5
> --- /dev/null
> +++ b/meta-oe/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-oe/recipes-connectivity/bluez/bluez4.inc b/meta-oe/recipes-connectivity/bluez/bluez4.inc
> new file mode 100644
> index 0000000..11c9616
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4.inc
> @@ -0,0 +1,46 @@
> +SUMMARY = "Linux Bluetooth Stack Userland V4"
> +DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries."
> +HOMEPAGE = "http://www.bluez.org"
> +SECTION = "libs"
> +LICENSE = "GPLv2+ & LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> + file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
> + file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
> + file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
> +DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
> +RDEPENDS_${PN}-dev = "bluez-hcidump"
> +
> +PACKAGECONFIG ??= "\
> + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
> + ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
> +"
> +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
> +PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
> +
> +ASNEEDED = ""
> +
> +SRC_URI = "\
> + ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \
> +"
> +S = "${WORKDIR}/bluez-${PV}"
> +
> +inherit autotools-brokensep pkgconfig
> +
> +EXTRA_OECONF = "\
> + --disable-gstreamer \
> + --enable-usb \
> + --enable-tools \
> + --enable-bccmd \
> + --enable-hid2hci \
> + --enable-dfutool \
> + --disable-hidd \
> + --disable-pand \
> + --disable-dund \
> + --disable-cups \
> + --enable-test \
> + --enable-datafiles \
> + --with-udevdir=`pkg-config --variable=udevdir udev` \
> + --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
> +"
> +
> +EXCLUDE_FROM_WORLD = "1"
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> new file mode 100644
> index 0000000..28a94ed
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> @@ -0,0 +1,46 @@
> +require bluez4.inc
> +
> +PR = "r11"
> +
> +SRC_URI += "file://bluetooth.conf \
> + file://sbc_mmx.patch \
> + file://fix-udev-paths.patch \
> + 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"
> +SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
> +
> +RCONFLICTS_${PN} = "bluez5"
> +
> +do_install_append() {
> + install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
> + install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
> + install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
> + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
> + install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
> +}
> +
> +RDEPENDS_${PN}-dev = "bluez-hcidump"
> +RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
> +
> +ALLOW_EMPTY_libasound-module-bluez = "1"
> +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"
> +FILES_${PN}-dev += "\
> + ${libdir}/bluetooth/plugins/*.la \
> + ${libdir}/alsa-lib/*.la \
> +"
> +
> +FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
> +
> +FILES_${PN}-dbg += "\
> + ${libdir}/bluetooth/plugins/.debug \
> + ${libdir}/*/.debug \
> + */udev/.debug \
> + "
> diff --git a/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> new file mode 100644
> index 0000000..c71d612
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> @@ -0,0 +1,39 @@
> +require bluez4.inc
> +require recipes-multimedia/gstreamer/gst-plugins-package.inc
> +
> +PR = "r1"
> +
> +SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
> +SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
> +
> +DEPENDS = "bluez4 gst-plugins-base"
> +
> +EXTRA_OECONF = "\
> + --enable-gstreamer \
> +"
> +
> +# clean unwanted files
> +do_install_append() {
> + rm -rf ${D}${bindir}
> + rm -rf ${D}${sbindir}
> + rm -f ${D}${libdir}/lib*
> + rm -rf ${D}${libdir}/pkgconfig
> + rm -rf ${D}${sysconfdir}
> + rm -rf ${D}${base_libdir}
> + rm -rf ${D}${libdir}/bluetooth
> + rm -rf ${D}${localstatedir}
> + rm -rf ${D}${libdir}/alsa-lib
> + rm -rf ${D}${datadir}
> + rm -rf ${D}${includedir}
> + rm -rf ${D}${nonarch_base_libdir}
> +}
> +
> +FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so"
> +FILES_${PN}-dev += "\
> + ${libdir}/gstreamer-0.10/*.la \
> +"
> +
> +FILES_${PN}-dbg += "\
> + ${libdir}/*/.debug \
> +"
> +
> --
> 2.1.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] bluez collection: add (moved from oe-core)
2015-04-03 17:45 ` Martin Jansa
@ 2015-04-06 7:21 ` Iorga, Cristian
2015-04-07 10:57 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Iorga, Cristian @ 2015-04-06 7:21 UTC (permalink / raw)
To: openembedded-devel
No, I intended to place it exactly where it is in the patch.
-----Original Message-----
From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of Martin Jansa
Sent: Friday, April 3, 2015 8:45 PM
To: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][PATCH] bluez collection: add (moved from oe-core)
On Fri, Apr 03, 2015 at 05:16:48PM +0300, Cristian Iorga wrote:
> BlueZ 4.x Bluetooth stack has been removed from oe-core.
> However, it is still supported, so add it to meta-oe networking layer.
"meta-oe netwrorking layer" is very confusing, did you plan to put it in meta-networking?
> In order to use it in oe-core/poky/YP 'bluez4' needs to be added to
> distro features. 'bluetooth' distro feature needs to be present also.
>
> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> ---
> .../obsolete_automake_macros.patch | 14 +++++++
> .../bluez/bluez-hcidump_2.5.bb | 22 +++++++++++
> .../bluez/bluez4-4.101/bluetooth.conf | 16 ++++++++
> .../bluez/bluez4-4.101/fix-udev-paths.patch | 37 +++++++++++++++++
> .../bluez/bluez4-4.101/install-test-script.patch | 26 ++++++++++++
> ...ork-fix-network-Connect-method-parameters.patch | 30 ++++++++++++++
> .../bluez4-4.101/obsolete_automake_macros.patch | 14 +++++++
> .../bluez/bluez4-4.101/sbc_mmx.patch | 24 +++++++++++
> ...pygobject-instead-ofgobject-introspection.patch | 27 +++++++++++++
> meta-oe/recipes-connectivity/bluez/bluez4.inc | 46 ++++++++++++++++++++++
> meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb | 46 ++++++++++++++++++++++
> .../bluez/gst-plugin-bluetooth_4.101.bb | 39 ++++++++++++++++++
> 12 files changed, 341 insertions(+)
> create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake
> _macros.patch create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.pa
> tch create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Co
> nnect-method-parameters.patch create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macr
> os.patch create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> create mode 100644
> meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-i
> nstead-ofgobject-introspection.patch
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4.inc
> create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> create mode 100644
> meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
>
> diff --git
> a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automa
> ke_macros.patch
> b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automa
> ke_macros.patch
> new file mode 100644
> index 0000000..0c77f1a
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_au
> +++ tomake_macros.patch
> @@ -0,0 +1,14 @@
> +Upstream-Status: Pending [package obsolete/not maintained by
> +upstream]
> +
> +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> diff -Nurd
> +bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac
> +--- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200
> ++++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200
> +@@ -2,7 +2,7 @@
> + AC_INIT(bluez-hcidump, 2.5)
> +
> + AM_INIT_AUTOMAKE([foreign subdir-objects])
> +-AM_CONFIG_HEADER(config.h)
> ++AC_CONFIG_HEADERS(config.h)
> +
> + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> new file mode 100644
> index 0000000..3950630
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> @@ -0,0 +1,22 @@
> +SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool"
> +DESCRIPTION = "The hcidump tool reads raw HCI data coming from and
> +going to a Bluetooth device \ and displays the commands, events and data in a human-readable form."
> +
> +SECTION = "console"
> +# hcidump was integrated into bluez5
> +DEPENDS = "bluez4"
> +RCONFLICTS_${PN} = "bluez5"
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
> + file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
> +PR = "r1"
> +
> +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz \
> + file://obsolete_automake_macros.patch \ "
> +
> +SRC_URI[md5sum] = "2eab54bbd2b59a2ed4274ebb9390cf18"
> +SRC_URI[sha256sum] = "9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d88881"
> +S = "${WORKDIR}/bluez-hcidump-${PV}"
> +
> +inherit autotools
> diff --git
> a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> new file mode 100644
> index 0000000..ca5e9e4
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> @@ -0,0 +1,16 @@
> +<!-- This configuration file specifies the required security policies
> + for Bluetooth core daemon to work. -->
> +
> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
> + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> +<busconfig>
> +
> + <!-- ../system.conf have denied everything, so we just punch some
> + holes -->
> +
> + <policy context="default">
> + <allow own="org.bluez"/>
> + <allow send_destination="org.bluez"/>
> + <allow send_interface="org.bluez.Agent"/>
> + </policy>
> +
> +</busconfig>
> diff --git
> a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> new file mode 100644
> index 0000000..8089914
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.p
> +++ atch
> @@ -0,0 +1,37 @@
> +Add udevdir/udevrulesdir options
> +
> +Upstream-Status: Inappropriate [configuration]
> +Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> +
> +Index: bluez-4.101/Makefile.am
> +===================================================================
> +--- bluez-4.101.orig/Makefile.am
> ++++ bluez-4.101/Makefile.am
> +@@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf include
> +Makefile.tools
> +
> + if DATAFILES
> +-rulesdir = @UDEV_DIR@/rules.d
> ++rulesdir = @UDEV_RULES_DIR@
> +
> + udev_files =
> +
> +Index: bluez-4.101/configure.ac
> +===================================================================
> +--- bluez-4.101.orig/configure.ac
> ++++ bluez-4.101/configure.ac
> +@@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then fi
> +AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
> +
> ++AC_ARG_WITH([udevdir],
> ++ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
> ++ [], [with_udevdir=/lib/udev/])
> ++AC_SUBST([UDEV_DIR], [$with_udevdir])
> ++
> ++AC_ARG_WITH([udevrulesdir],
> ++ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]),
> ++ [], [with_udevrulesdir=/lib/udev/rules.d])
> ++AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir])
> ++
> + AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8
> + src/bluetooth.service bluez.pc)
> diff --git
> a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.
> patch
> b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.
> patch
> new file mode 100644
> index 0000000..23f7d99
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-scr
> +++ ipt.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-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-
> Connect-method-parameters.patch
> b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-
> Connect-method-parameters.patch
> new file mode 100644
> index 0000000..37f9199
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-netw
> +++ ork-Connect-method-parameters.patch
> @@ -0,0 +1,30 @@
> +Upstream-Status: Backport
> +Signed-off-by: Peter A. Bigot <pab@pabigot.com>
> +
> +From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00
> +2001
> +From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> +Date: Sat, 30 Jun 2012 00:39:05 -0300
> +Subject: [PATCH] network: fix network Connect() method parameters
> +
> +---
> + network/connection.c | 4 +++-
> + 1 file changed, 3 insertions(+), 1 deletion(-)
> +
> +diff --git a/network/connection.c b/network/connection.c index
> +544ec3a..59423a9 100644
> +--- a/network/connection.c
> ++++ b/network/connection.c
> +@@ -554,7 +554,9 @@ static void path_unregister(void *data)
> +
> + static const GDBusMethodTable connection_methods[] = {
> + { GDBUS_ASYNC_METHOD("Connect",
> +- NULL, NULL, connection_connect) },
> ++ GDBUS_ARGS({"uuid", "s"}),
> ++ GDBUS_ARGS({"interface", "s"}),
> ++ connection_connect) },
> + { GDBUS_METHOD("Disconnect",
> + NULL, NULL, connection_disconnect) },
> + { GDBUS_METHOD("GetProperties",
> +--
> +1.7.9.5
> +
> diff --git
> a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_ma
> cros.patch
> b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_ma
> cros.patch
> new file mode 100644
> index 0000000..1068f24
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automak
> +++ e_macros.patch
> @@ -0,0 +1,14 @@
> +Upstream-Status: Backport
> +
> +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> diff -Nurd
> +bluez-4.101/configure.ac bluez-4.101/configure.ac
> +--- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300
> ++++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200
> +@@ -2,7 +2,7 @@
> + AC_INIT(bluez, 4.101)
> +
> + AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
> +-AM_CONFIG_HEADER(config.h)
> ++AC_CONFIG_HEADERS(config.h)
> +
> + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> diff --git
> a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> new file mode 100644
> index 0000000..98fab45
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> @@ -0,0 +1,24 @@
> +on x86 and x86_64 gcc 4.7 complains
> +
> +sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx':
> +sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably
> +doesn't match constraints [enabled by default]
> +sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm'
> +
> +This patch is taken from
> +https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +
> +Upstream-Status: Pending
> +Index: bluez-4.98/sbc/sbc_primitives_mmx.c
> +===================================================================
> +--- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800
> ++++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800
> +@@ -318,7 +318,7 @@
> + "movl %k0, 4(%3)\n"
> + : "+r" (blk)
> + : "r" (&sb_sample_f[0][ch][sb]),
> +- "i" ((char *) &sb_sample_f[1][0][0] -
> ++ "r" ((char *) &sb_sample_f[1][0][0] -
> + (char *) &sb_sample_f[0][0][0]),
> + "r" (&scale_factor[ch][sb]),
> + "r" (&consts),
> diff --git
> a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject
> -instead-ofgobject-introspection.patch
> b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject
> -instead-ofgobject-introspection.patch
> new file mode 100644
> index 0000000..37037f5
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygob
> +++ ject-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-oe/recipes-connectivity/bluez/bluez4.inc
> b/meta-oe/recipes-connectivity/bluez/bluez4.inc
> new file mode 100644
> index 0000000..11c9616
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4.inc
> @@ -0,0 +1,46 @@
> +SUMMARY = "Linux Bluetooth Stack Userland V4"
> +DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries."
> +HOMEPAGE = "http://www.bluez.org"
> +SECTION = "libs"
> +LICENSE = "GPLv2+ & LGPLv2.1+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> + file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
> + file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
> + file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
> +DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
> +RDEPENDS_${PN}-dev = "bluez-hcidump"
> +
> +PACKAGECONFIG ??= "\
> + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
> + ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ "
> +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
> +PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
> +
> +ASNEEDED = ""
> +
> +SRC_URI = "\
> + ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ "
> +S = "${WORKDIR}/bluez-${PV}"
> +
> +inherit autotools-brokensep pkgconfig
> +
> +EXTRA_OECONF = "\
> + --disable-gstreamer \
> + --enable-usb \
> + --enable-tools \
> + --enable-bccmd \
> + --enable-hid2hci \
> + --enable-dfutool \
> + --disable-hidd \
> + --disable-pand \
> + --disable-dund \
> + --disable-cups \
> + --enable-test \
> + --enable-datafiles \
> + --with-udevdir=`pkg-config --variable=udevdir udev` \
> + --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
> +"
> +
> +EXCLUDE_FROM_WORLD = "1"
> diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> new file mode 100644
> index 0000000..28a94ed
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> @@ -0,0 +1,46 @@
> +require bluez4.inc
> +
> +PR = "r11"
> +
> +SRC_URI += "file://bluetooth.conf \
> + file://sbc_mmx.patch \
> + file://fix-udev-paths.patch \
> + 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"
> +SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
> +
> +RCONFLICTS_${PN} = "bluez5"
> +
> +do_install_append() {
> + install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
> + install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
> + install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
> + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
> + install -m 0644 ${WORKDIR}/bluetooth.conf
> +${D}/${sysconfdir}/dbus-1/system.d/
> +}
> +
> +RDEPENDS_${PN}-dev = "bluez-hcidump"
> +RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
> +
> +ALLOW_EMPTY_libasound-module-bluez = "1"
> +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"
> +FILES_${PN}-dev += "\
> + ${libdir}/bluetooth/plugins/*.la \
> + ${libdir}/alsa-lib/*.la \
> +"
> +
> +FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
> +
> +FILES_${PN}-dbg += "\
> + ${libdir}/bluetooth/plugins/.debug \
> + ${libdir}/*/.debug \
> + */udev/.debug \
> + "
> diff --git
> a/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> new file mode 100644
> index 0000000..c71d612
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> @@ -0,0 +1,39 @@
> +require bluez4.inc
> +require recipes-multimedia/gstreamer/gst-plugins-package.inc
> +
> +PR = "r1"
> +
> +SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
> +SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
> +
> +DEPENDS = "bluez4 gst-plugins-base"
> +
> +EXTRA_OECONF = "\
> + --enable-gstreamer \
> +"
> +
> +# clean unwanted files
> +do_install_append() {
> + rm -rf ${D}${bindir}
> + rm -rf ${D}${sbindir}
> + rm -f ${D}${libdir}/lib*
> + rm -rf ${D}${libdir}/pkgconfig
> + rm -rf ${D}${sysconfdir}
> + rm -rf ${D}${base_libdir}
> + rm -rf ${D}${libdir}/bluetooth
> + rm -rf ${D}${localstatedir}
> + rm -rf ${D}${libdir}/alsa-lib
> + rm -rf ${D}${datadir}
> + rm -rf ${D}${includedir}
> + rm -rf ${D}${nonarch_base_libdir}
> +}
> +
> +FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so"
> +FILES_${PN}-dev += "\
> + ${libdir}/gstreamer-0.10/*.la \
> +"
> +
> +FILES_${PN}-dbg += "\
> + ${libdir}/*/.debug \
> +"
> +
> --
> 2.1.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] bluez collection: add (moved from oe-core)
2015-04-06 7:21 ` Iorga, Cristian
@ 2015-04-07 10:57 ` Martin Jansa
2015-04-08 11:05 ` Iorga, Cristian
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2015-04-07 10:57 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 21802 bytes --]
On Mon, Apr 06, 2015 at 07:21:49AM +0000, Iorga, Cristian wrote:
> No, I intended to place it exactly where it is in the patch.
Then improve the commit message and fix indentation (use 4 spaces
instead of tabs).
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of Martin Jansa
> Sent: Friday, April 3, 2015 8:45 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH] bluez collection: add (moved from oe-core)
>
> On Fri, Apr 03, 2015 at 05:16:48PM +0300, Cristian Iorga wrote:
> > BlueZ 4.x Bluetooth stack has been removed from oe-core.
> > However, it is still supported, so add it to meta-oe networking layer.
>
> "meta-oe netwrorking layer" is very confusing, did you plan to put it in meta-networking?
>
> > In order to use it in oe-core/poky/YP 'bluez4' needs to be added to
> > distro features. 'bluetooth' distro feature needs to be present also.
> >
> > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> > ---
> > .../obsolete_automake_macros.patch | 14 +++++++
> > .../bluez/bluez-hcidump_2.5.bb | 22 +++++++++++
> > .../bluez/bluez4-4.101/bluetooth.conf | 16 ++++++++
> > .../bluez/bluez4-4.101/fix-udev-paths.patch | 37 +++++++++++++++++
> > .../bluez/bluez4-4.101/install-test-script.patch | 26 ++++++++++++
> > ...ork-fix-network-Connect-method-parameters.patch | 30 ++++++++++++++
> > .../bluez4-4.101/obsolete_automake_macros.patch | 14 +++++++
> > .../bluez/bluez4-4.101/sbc_mmx.patch | 24 +++++++++++
> > ...pygobject-instead-ofgobject-introspection.patch | 27 +++++++++++++
> > meta-oe/recipes-connectivity/bluez/bluez4.inc | 46 ++++++++++++++++++++++
> > meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb | 46 ++++++++++++++++++++++
> > .../bluez/gst-plugin-bluetooth_4.101.bb | 39 ++++++++++++++++++
> > 12 files changed, 341 insertions(+)
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake
> > _macros.patch create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.pa
> > tch create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Co
> > nnect-method-parameters.patch create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macr
> > os.patch create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-i
> > nstead-ofgobject-introspection.patch
> > create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4.inc
> > create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> >
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automa
> > ke_macros.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automa
> > ke_macros.patch
> > new file mode 100644
> > index 0000000..0c77f1a
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_au
> > +++ tomake_macros.patch
> > @@ -0,0 +1,14 @@
> > +Upstream-Status: Pending [package obsolete/not maintained by
> > +upstream]
> > +
> > +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> diff -Nurd
> > +bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac
> > +--- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200
> > ++++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200
> > +@@ -2,7 +2,7 @@
> > + AC_INIT(bluez-hcidump, 2.5)
> > +
> > + AM_INIT_AUTOMAKE([foreign subdir-objects])
> > +-AM_CONFIG_HEADER(config.h)
> > ++AC_CONFIG_HEADERS(config.h)
> > +
> > + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> > diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> > b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> > new file mode 100644
> > index 0000000..3950630
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> > @@ -0,0 +1,22 @@
> > +SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool"
> > +DESCRIPTION = "The hcidump tool reads raw HCI data coming from and
> > +going to a Bluetooth device \ and displays the commands, events and data in a human-readable form."
> > +
> > +SECTION = "console"
> > +# hcidump was integrated into bluez5
> > +DEPENDS = "bluez4"
> > +RCONFLICTS_${PN} = "bluez5"
> > +LICENSE = "GPLv2+"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
> > + file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
> > +PR = "r1"
> > +
> > +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz \
> > + file://obsolete_automake_macros.patch \ "
> > +
> > +SRC_URI[md5sum] = "2eab54bbd2b59a2ed4274ebb9390cf18"
> > +SRC_URI[sha256sum] = "9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d88881"
> > +S = "${WORKDIR}/bluez-hcidump-${PV}"
> > +
> > +inherit autotools
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> > new file mode 100644
> > index 0000000..ca5e9e4
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> > @@ -0,0 +1,16 @@
> > +<!-- This configuration file specifies the required security policies
> > + for Bluetooth core daemon to work. -->
> > +
> > +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
> > + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> > +<busconfig>
> > +
> > + <!-- ../system.conf have denied everything, so we just punch some
> > + holes -->
> > +
> > + <policy context="default">
> > + <allow own="org.bluez"/>
> > + <allow send_destination="org.bluez"/>
> > + <allow send_interface="org.bluez.Agent"/>
> > + </policy>
> > +
> > +</busconfig>
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> > new file mode 100644
> > index 0000000..8089914
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.p
> > +++ atch
> > @@ -0,0 +1,37 @@
> > +Add udevdir/udevrulesdir options
> > +
> > +Upstream-Status: Inappropriate [configuration]
> > +Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> > +
> > +Index: bluez-4.101/Makefile.am
> > +===================================================================
> > +--- bluez-4.101.orig/Makefile.am
> > ++++ bluez-4.101/Makefile.am
> > +@@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf include
> > +Makefile.tools
> > +
> > + if DATAFILES
> > +-rulesdir = @UDEV_DIR@/rules.d
> > ++rulesdir = @UDEV_RULES_DIR@
> > +
> > + udev_files =
> > +
> > +Index: bluez-4.101/configure.ac
> > +===================================================================
> > +--- bluez-4.101.orig/configure.ac
> > ++++ bluez-4.101/configure.ac
> > +@@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then fi
> > +AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
> > +
> > ++AC_ARG_WITH([udevdir],
> > ++ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
> > ++ [], [with_udevdir=/lib/udev/])
> > ++AC_SUBST([UDEV_DIR], [$with_udevdir])
> > ++
> > ++AC_ARG_WITH([udevrulesdir],
> > ++ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]),
> > ++ [], [with_udevrulesdir=/lib/udev/rules.d])
> > ++AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir])
> > ++
> > + AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8
> > + src/bluetooth.service bluez.pc)
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.
> > patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.
> > patch
> > new file mode 100644
> > index 0000000..23f7d99
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-scr
> > +++ ipt.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-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-
> > Connect-method-parameters.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-
> > Connect-method-parameters.patch
> > new file mode 100644
> > index 0000000..37f9199
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-netw
> > +++ ork-Connect-method-parameters.patch
> > @@ -0,0 +1,30 @@
> > +Upstream-Status: Backport
> > +Signed-off-by: Peter A. Bigot <pab@pabigot.com>
> > +
> > +From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00
> > +2001
> > +From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> > +Date: Sat, 30 Jun 2012 00:39:05 -0300
> > +Subject: [PATCH] network: fix network Connect() method parameters
> > +
> > +---
> > + network/connection.c | 4 +++-
> > + 1 file changed, 3 insertions(+), 1 deletion(-)
> > +
> > +diff --git a/network/connection.c b/network/connection.c index
> > +544ec3a..59423a9 100644
> > +--- a/network/connection.c
> > ++++ b/network/connection.c
> > +@@ -554,7 +554,9 @@ static void path_unregister(void *data)
> > +
> > + static const GDBusMethodTable connection_methods[] = {
> > + { GDBUS_ASYNC_METHOD("Connect",
> > +- NULL, NULL, connection_connect) },
> > ++ GDBUS_ARGS({"uuid", "s"}),
> > ++ GDBUS_ARGS({"interface", "s"}),
> > ++ connection_connect) },
> > + { GDBUS_METHOD("Disconnect",
> > + NULL, NULL, connection_disconnect) },
> > + { GDBUS_METHOD("GetProperties",
> > +--
> > +1.7.9.5
> > +
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_ma
> > cros.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_ma
> > cros.patch
> > new file mode 100644
> > index 0000000..1068f24
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automak
> > +++ e_macros.patch
> > @@ -0,0 +1,14 @@
> > +Upstream-Status: Backport
> > +
> > +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> diff -Nurd
> > +bluez-4.101/configure.ac bluez-4.101/configure.ac
> > +--- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300
> > ++++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200
> > +@@ -2,7 +2,7 @@
> > + AC_INIT(bluez, 4.101)
> > +
> > + AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
> > +-AM_CONFIG_HEADER(config.h)
> > ++AC_CONFIG_HEADERS(config.h)
> > +
> > + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> > new file mode 100644
> > index 0000000..98fab45
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> > @@ -0,0 +1,24 @@
> > +on x86 and x86_64 gcc 4.7 complains
> > +
> > +sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx':
> > +sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably
> > +doesn't match constraints [enabled by default]
> > +sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm'
> > +
> > +This patch is taken from
> > +https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871
> > +
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +
> > +Upstream-Status: Pending
> > +Index: bluez-4.98/sbc/sbc_primitives_mmx.c
> > +===================================================================
> > +--- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800
> > ++++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800
> > +@@ -318,7 +318,7 @@
> > + "movl %k0, 4(%3)\n"
> > + : "+r" (blk)
> > + : "r" (&sb_sample_f[0][ch][sb]),
> > +- "i" ((char *) &sb_sample_f[1][0][0] -
> > ++ "r" ((char *) &sb_sample_f[1][0][0] -
> > + (char *) &sb_sample_f[0][0][0]),
> > + "r" (&scale_factor[ch][sb]),
> > + "r" (&consts),
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject
> > -instead-ofgobject-introspection.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject
> > -instead-ofgobject-introspection.patch
> > new file mode 100644
> > index 0000000..37037f5
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygob
> > +++ ject-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-oe/recipes-connectivity/bluez/bluez4.inc
> > b/meta-oe/recipes-connectivity/bluez/bluez4.inc
> > new file mode 100644
> > index 0000000..11c9616
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4.inc
> > @@ -0,0 +1,46 @@
> > +SUMMARY = "Linux Bluetooth Stack Userland V4"
> > +DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries."
> > +HOMEPAGE = "http://www.bluez.org"
> > +SECTION = "libs"
> > +LICENSE = "GPLv2+ & LGPLv2.1+"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> > + file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
> > + file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
> > + file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
> > +DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
> > +RDEPENDS_${PN}-dev = "bluez-hcidump"
> > +
> > +PACKAGECONFIG ??= "\
> > + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
> > + ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ "
> > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
> > +PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
> > +
> > +ASNEEDED = ""
> > +
> > +SRC_URI = "\
> > + ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ "
> > +S = "${WORKDIR}/bluez-${PV}"
> > +
> > +inherit autotools-brokensep pkgconfig
> > +
> > +EXTRA_OECONF = "\
> > + --disable-gstreamer \
> > + --enable-usb \
> > + --enable-tools \
> > + --enable-bccmd \
> > + --enable-hid2hci \
> > + --enable-dfutool \
> > + --disable-hidd \
> > + --disable-pand \
> > + --disable-dund \
> > + --disable-cups \
> > + --enable-test \
> > + --enable-datafiles \
> > + --with-udevdir=`pkg-config --variable=udevdir udev` \
> > + --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
> > +"
> > +
> > +EXCLUDE_FROM_WORLD = "1"
> > diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> > b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> > new file mode 100644
> > index 0000000..28a94ed
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> > @@ -0,0 +1,46 @@
> > +require bluez4.inc
> > +
> > +PR = "r11"
> > +
> > +SRC_URI += "file://bluetooth.conf \
> > + file://sbc_mmx.patch \
> > + file://fix-udev-paths.patch \
> > + 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"
> > +SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
> > +
> > +RCONFLICTS_${PN} = "bluez5"
> > +
> > +do_install_append() {
> > + install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
> > + install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
> > + install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
> > + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
> > + install -m 0644 ${WORKDIR}/bluetooth.conf
> > +${D}/${sysconfdir}/dbus-1/system.d/
> > +}
> > +
> > +RDEPENDS_${PN}-dev = "bluez-hcidump"
> > +RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
> > +
> > +ALLOW_EMPTY_libasound-module-bluez = "1"
> > +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"
> > +FILES_${PN}-dev += "\
> > + ${libdir}/bluetooth/plugins/*.la \
> > + ${libdir}/alsa-lib/*.la \
> > +"
> > +
> > +FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
> > +
> > +FILES_${PN}-dbg += "\
> > + ${libdir}/bluetooth/plugins/.debug \
> > + ${libdir}/*/.debug \
> > + */udev/.debug \
> > + "
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> > b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> > new file mode 100644
> > index 0000000..c71d612
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> > @@ -0,0 +1,39 @@
> > +require bluez4.inc
> > +require recipes-multimedia/gstreamer/gst-plugins-package.inc
> > +
> > +PR = "r1"
> > +
> > +SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
> > +SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
> > +
> > +DEPENDS = "bluez4 gst-plugins-base"
> > +
> > +EXTRA_OECONF = "\
> > + --enable-gstreamer \
> > +"
> > +
> > +# clean unwanted files
> > +do_install_append() {
> > + rm -rf ${D}${bindir}
> > + rm -rf ${D}${sbindir}
> > + rm -f ${D}${libdir}/lib*
> > + rm -rf ${D}${libdir}/pkgconfig
> > + rm -rf ${D}${sysconfdir}
> > + rm -rf ${D}${base_libdir}
> > + rm -rf ${D}${libdir}/bluetooth
> > + rm -rf ${D}${localstatedir}
> > + rm -rf ${D}${libdir}/alsa-lib
> > + rm -rf ${D}${datadir}
> > + rm -rf ${D}${includedir}
> > + rm -rf ${D}${nonarch_base_libdir}
> > +}
> > +
> > +FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so"
> > +FILES_${PN}-dev += "\
> > + ${libdir}/gstreamer-0.10/*.la \
> > +"
> > +
> > +FILES_${PN}-dbg += "\
> > + ${libdir}/*/.debug \
> > +"
> > +
> > --
> > 2.1.0
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] bluez collection: add (moved from oe-core)
2015-04-07 10:57 ` Martin Jansa
@ 2015-04-08 11:05 ` Iorga, Cristian
2015-04-08 11:18 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Iorga, Cristian @ 2015-04-08 11:05 UTC (permalink / raw)
To: openembedded-devel
Hi Martin,
I have to ask...
The patches (applying to bluez package) that are part of this submission, also needs to be changed to a 4 spaces tab?
I do agree on the others, I am not sure if it would be ok to alter the original patches.
Also, I did not know the difference in policies of OE versus oe-core, sorry, my fault.
Thanks,
Cristian
-----Original Message-----
From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of Martin Jansa
Sent: Tuesday, April 7, 2015 1:57 PM
To: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][PATCH] bluez collection: add (moved from oe-core)
On Mon, Apr 06, 2015 at 07:21:49AM +0000, Iorga, Cristian wrote:
> No, I intended to place it exactly where it is in the patch.
Then improve the commit message and fix indentation (use 4 spaces instead of tabs).
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf
> Of Martin Jansa
> Sent: Friday, April 3, 2015 8:45 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH] bluez collection: add (moved from
> oe-core)
>
> On Fri, Apr 03, 2015 at 05:16:48PM +0300, Cristian Iorga wrote:
> > BlueZ 4.x Bluetooth stack has been removed from oe-core.
> > However, it is still supported, so add it to meta-oe networking layer.
>
> "meta-oe netwrorking layer" is very confusing, did you plan to put it in meta-networking?
>
> > In order to use it in oe-core/poky/YP 'bluez4' needs to be added to
> > distro features. 'bluetooth' distro feature needs to be present also.
> >
> > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> > ---
> > .../obsolete_automake_macros.patch | 14 +++++++
> > .../bluez/bluez-hcidump_2.5.bb | 22 +++++++++++
> > .../bluez/bluez4-4.101/bluetooth.conf | 16 ++++++++
> > .../bluez/bluez4-4.101/fix-udev-paths.patch | 37 +++++++++++++++++
> > .../bluez/bluez4-4.101/install-test-script.patch | 26 ++++++++++++
> > ...ork-fix-network-Connect-method-parameters.patch | 30 ++++++++++++++
> > .../bluez4-4.101/obsolete_automake_macros.patch | 14 +++++++
> > .../bluez/bluez4-4.101/sbc_mmx.patch | 24 +++++++++++
> > ...pygobject-instead-ofgobject-introspection.patch | 27 +++++++++++++
> > meta-oe/recipes-connectivity/bluez/bluez4.inc | 46 ++++++++++++++++++++++
> > meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb | 46 ++++++++++++++++++++++
> > .../bluez/gst-plugin-bluetooth_4.101.bb | 39 ++++++++++++++++++
> > 12 files changed, 341 insertions(+) create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automa
> > ke
> > _macros.patch create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.
> > pa
> > tch create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-
> > Co nnect-method-parameters.patch create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_ma
> > cr
> > os.patch create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject
> > -i nstead-ofgobject-introspection.patch
> > create mode 100644 meta-oe/recipes-connectivity/bluez/bluez4.inc
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> > create mode 100644
> > meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> >
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_auto
> > ma
> > ke_macros.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_auto
> > ma
> > ke_macros.patch
> > new file mode 100644
> > index 0000000..0c77f1a
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_
> > +++ au
> > +++ tomake_macros.patch
> > @@ -0,0 +1,14 @@
> > +Upstream-Status: Pending [package obsolete/not maintained by
> > +upstream]
> > +
> > +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> diff -Nurd
> > +bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac
> > +--- bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.000000000 +0200
> > ++++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200
> > +@@ -2,7 +2,7 @@
> > + AC_INIT(bluez-hcidump, 2.5)
> > +
> > + AM_INIT_AUTOMAKE([foreign subdir-objects])
> > +-AM_CONFIG_HEADER(config.h)
> > ++AC_CONFIG_HEADERS(config.h)
> > +
> > + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> > diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> > b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> > new file mode 100644
> > index 0000000..3950630
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez-hcidump_2.5.bb
> > @@ -0,0 +1,22 @@
> > +SUMMARY = "Linux Bluetooth Stack HCI Debugger Tool"
> > +DESCRIPTION = "The hcidump tool reads raw HCI data coming from and
> > +going to a Bluetooth device \ and displays the commands, events and data in a human-readable form."
> > +
> > +SECTION = "console"
> > +# hcidump was integrated into bluez5 DEPENDS = "bluez4"
> > +RCONFLICTS_${PN} = "bluez5"
> > +LICENSE = "GPLv2+"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
> > + file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf"
> > +PR = "r1"
> > +
> > +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz \
> > + file://obsolete_automake_macros.patch \ "
> > +
> > +SRC_URI[md5sum] = "2eab54bbd2b59a2ed4274ebb9390cf18"
> > +SRC_URI[sha256sum] = "9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d88881"
> > +S = "${WORKDIR}/bluez-hcidump-${PV}"
> > +
> > +inherit autotools
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> > new file mode 100644
> > index 0000000..ca5e9e4
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf
> > @@ -0,0 +1,16 @@
> > +<!-- This configuration file specifies the required security policies
> > + for Bluetooth core daemon to work. -->
> > +
> > +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
> > + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
> > +<busconfig>
> > +
> > + <!-- ../system.conf have denied everything, so we just punch some
> > + holes -->
> > +
> > + <policy context="default">
> > + <allow own="org.bluez"/>
> > + <allow send_destination="org.bluez"/>
> > + <allow send_interface="org.bluez.Agent"/>
> > + </policy>
> > +
> > +</busconfig>
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.pat
> > ch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.pat
> > ch
> > new file mode 100644
> > index 0000000..8089914
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths
> > +++ .p
> > +++ atch
> > @@ -0,0 +1,37 @@
> > +Add udevdir/udevrulesdir options
> > +
> > +Upstream-Status: Inappropriate [configuration]
> > +Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> > +
> > +Index: bluez-4.101/Makefile.am
> > +===================================================================
> > +--- bluez-4.101.orig/Makefile.am
> > ++++ bluez-4.101/Makefile.am
> > +@@ -395,7 +395,7 @@ EXTRA_DIST += audio/bluetooth.conf include
> > +Makefile.tools
> > +
> > + if DATAFILES
> > +-rulesdir = @UDEV_DIR@/rules.d
> > ++rulesdir = @UDEV_RULES_DIR@
> > +
> > + udev_files =
> > +
> > +Index: bluez-4.101/configure.ac
> > +===================================================================
> > +--- bluez-4.101.orig/configure.ac
> > ++++ bluez-4.101/configure.ac
> > +@@ -61,4 +61,14 @@ if (test -n "${path_systemdunit}"); then fi
> > +AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
> > +
> > ++AC_ARG_WITH([udevdir],
> > ++ AS_HELP_STRING([--with-udevdir=DIR], [udev directory]),
> > ++ [], [with_udevdir=/lib/udev/]) AC_SUBST([UDEV_DIR],
> > ++[$with_udevdir])
> > ++
> > ++AC_ARG_WITH([udevrulesdir],
> > ++ AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules directory]),
> > ++ [], [with_udevrulesdir=/lib/udev/rules.d])
> > ++AC_SUBST([UDEV_RULES_DIR], [$with_udevrulesdir])
> > ++
> > + AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8
> > + src/bluetooth.service bluez.pc)
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.
> > patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-script.
> > patch
> > new file mode 100644
> > index 0000000..23f7d99
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/install-test-s
> > +++ cr
> > +++ ipt.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-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-networ
> > k-
> > Connect-method-parameters.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-networ
> > k-
> > Connect-method-parameters.patch
> > new file mode 100644
> > index 0000000..37f9199
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/network-fix-ne
> > +++ tw ork-Connect-method-parameters.patch
> > @@ -0,0 +1,30 @@
> > +Upstream-Status: Backport
> > +Signed-off-by: Peter A. Bigot <pab@pabigot.com>
> > +
> > +From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00
> > +2001
> > +From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> > +Date: Sat, 30 Jun 2012 00:39:05 -0300
> > +Subject: [PATCH] network: fix network Connect() method parameters
> > +
> > +---
> > + network/connection.c | 4 +++-
> > + 1 file changed, 3 insertions(+), 1 deletion(-)
> > +
> > +diff --git a/network/connection.c b/network/connection.c index
> > +544ec3a..59423a9 100644
> > +--- a/network/connection.c
> > ++++ b/network/connection.c
> > +@@ -554,7 +554,9 @@ static void path_unregister(void *data)
> > +
> > + static const GDBusMethodTable connection_methods[] = {
> > + { GDBUS_ASYNC_METHOD("Connect",
> > +- NULL, NULL, connection_connect) },
> > ++ GDBUS_ARGS({"uuid", "s"}),
> > ++ GDBUS_ARGS({"interface", "s"}),
> > ++ connection_connect) },
> > + { GDBUS_METHOD("Disconnect",
> > + NULL, NULL, connection_disconnect) },
> > + { GDBUS_METHOD("GetProperties",
> > +--
> > +1.7.9.5
> > +
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_
> > ma
> > cros.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_
> > ma
> > cros.patch
> > new file mode 100644
> > index 0000000..1068f24
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/obsolete_autom
> > +++ ak
> > +++ e_macros.patch
> > @@ -0,0 +1,14 @@
> > +Upstream-Status: Backport
> > +
> > +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> diff -Nurd
> > +bluez-4.101/configure.ac bluez-4.101/configure.ac
> > +--- bluez-4.101/configure.ac 2012-06-22 19:36:49.000000000 +0300
> > ++++ bluez-4.101/configure.ac 2013-01-07 06:13:18.385888966 +0200
> > +@@ -2,7 +2,7 @@
> > + AC_INIT(bluez, 4.101)
> > +
> > + AM_INIT_AUTOMAKE([foreign subdir-objects color-tests])
> > +-AM_CONFIG_HEADER(config.h)
> > ++AC_CONFIG_HEADERS(config.h)
> > +
> > + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> > new file mode 100644
> > index 0000000..98fab45
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch
> > @@ -0,0 +1,24 @@
> > +on x86 and x86_64 gcc 4.7 complains
> > +
> > +sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx':
> > +sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably
> > +doesn't match constraints [enabled by default]
> > +sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm'
> > +
> > +This patch is taken from
> > +https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871
> > +
> > +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > +
> > +Upstream-Status: Pending
> > +Index: bluez-4.98/sbc/sbc_primitives_mmx.c
> > +===================================================================
> > +--- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800
> > ++++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800
> > +@@ -318,7 +318,7 @@
> > + "movl %k0, 4(%3)\n"
> > + : "+r" (blk)
> > + : "r" (&sb_sample_f[0][ch][sb]),
> > +- "i" ((char *) &sb_sample_f[1][0][0] -
> > ++ "r" ((char *) &sb_sample_f[1][0][0] -
> > + (char *) &sb_sample_f[0][0][0]),
> > + "r" (&scale_factor[ch][sb]),
> > + "r" (&consts),
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobje
> > ct -instead-ofgobject-introspection.patch
> > b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobje
> > ct -instead-ofgobject-introspection.patch
> > new file mode 100644
> > index 0000000..37037f5
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pyg
> > +++ ob ject-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-oe/recipes-connectivity/bluez/bluez4.inc
> > b/meta-oe/recipes-connectivity/bluez/bluez4.inc
> > new file mode 100644
> > index 0000000..11c9616
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4.inc
> > @@ -0,0 +1,46 @@
> > +SUMMARY = "Linux Bluetooth Stack Userland V4"
> > +DESCRIPTION = "Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries."
> > +HOMEPAGE = "http://www.bluez.org"
> > +SECTION = "libs"
> > +LICENSE = "GPLv2+ & LGPLv2.1+"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
> > + file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \
> > + file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \
> > + file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191"
> > +DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
> > +RDEPENDS_${PN}-dev = "bluez-hcidump"
> > +
> > +PACKAGECONFIG ??= "\
> > + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
> > + ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ "
> > +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
> > +PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
> > +
> > +ASNEEDED = ""
> > +
> > +SRC_URI = "\
> > + ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ "
> > +S = "${WORKDIR}/bluez-${PV}"
> > +
> > +inherit autotools-brokensep pkgconfig
> > +
> > +EXTRA_OECONF = "\
> > + --disable-gstreamer \
> > + --enable-usb \
> > + --enable-tools \
> > + --enable-bccmd \
> > + --enable-hid2hci \
> > + --enable-dfutool \
> > + --disable-hidd \
> > + --disable-pand \
> > + --disable-dund \
> > + --disable-cups \
> > + --enable-test \
> > + --enable-datafiles \
> > + --with-udevdir=`pkg-config --variable=udevdir udev` \
> > + --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d
> > +\ "
> > +
> > +EXCLUDE_FROM_WORLD = "1"
> > diff --git a/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> > b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> > new file mode 100644
> > index 0000000..28a94ed
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb
> > @@ -0,0 +1,46 @@
> > +require bluez4.inc
> > +
> > +PR = "r11"
> > +
> > +SRC_URI += "file://bluetooth.conf \
> > + file://sbc_mmx.patch \
> > + file://fix-udev-paths.patch \
> > + 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"
> > +SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
> > +
> > +RCONFLICTS_${PN} = "bluez5"
> > +
> > +do_install_append() {
> > + install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
> > + install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
> > + install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
> > + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
> > + install -m 0644 ${WORKDIR}/bluetooth.conf
> > +${D}/${sysconfdir}/dbus-1/system.d/
> > +}
> > +
> > +RDEPENDS_${PN}-dev = "bluez-hcidump"
> > +RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
> > +
> > +ALLOW_EMPTY_libasound-module-bluez = "1"
> > +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"
> > +FILES_${PN}-dev += "\
> > + ${libdir}/bluetooth/plugins/*.la \
> > + ${libdir}/alsa-lib/*.la \
> > +"
> > +
> > +FILES_${PN}-testtools = "${libdir}/bluez4/test/*"
> > +
> > +FILES_${PN}-dbg += "\
> > + ${libdir}/bluetooth/plugins/.debug \
> > + ${libdir}/*/.debug \
> > + */udev/.debug \
> > + "
> > diff --git
> > a/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> > b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb
> > new file mode 100644
> > index 0000000..c71d612
> > --- /dev/null
> > +++ b/meta-oe/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.
> > +++ bb
> > @@ -0,0 +1,39 @@
> > +require bluez4.inc
> > +require recipes-multimedia/gstreamer/gst-plugins-package.inc
> > +
> > +PR = "r1"
> > +
> > +SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"
> > +SRC_URI[sha256sum] = "59738410ade9f0e61a13c0f77d9aaffaafe49ba9418107e4ad75fe52846f7487"
> > +
> > +DEPENDS = "bluez4 gst-plugins-base"
> > +
> > +EXTRA_OECONF = "\
> > + --enable-gstreamer \
> > +"
> > +
> > +# clean unwanted files
> > +do_install_append() {
> > + rm -rf ${D}${bindir}
> > + rm -rf ${D}${sbindir}
> > + rm -f ${D}${libdir}/lib*
> > + rm -rf ${D}${libdir}/pkgconfig
> > + rm -rf ${D}${sysconfdir}
> > + rm -rf ${D}${base_libdir}
> > + rm -rf ${D}${libdir}/bluetooth
> > + rm -rf ${D}${localstatedir}
> > + rm -rf ${D}${libdir}/alsa-lib
> > + rm -rf ${D}${datadir}
> > + rm -rf ${D}${includedir}
> > + rm -rf ${D}${nonarch_base_libdir}
> > +}
> > +
> > +FILES_${PN} = "${libdir}/gstreamer-0.10/lib*.so"
> > +FILES_${PN}-dev += "\
> > + ${libdir}/gstreamer-0.10/*.la \
> > +"
> > +
> > +FILES_${PN}-dbg += "\
> > + ${libdir}/*/.debug \
> > +"
> > +
> > --
> > 2.1.0
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] bluez collection: add (moved from oe-core)
2015-04-08 11:05 ` Iorga, Cristian
@ 2015-04-08 11:18 ` Martin Jansa
0 siblings, 0 replies; 6+ messages in thread
From: Martin Jansa @ 2015-04-08 11:18 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3134 bytes --]
On Wed, Apr 08, 2015 at 11:05:57AM +0000, Iorga, Cristian wrote:
> Hi Martin,
>
> I have to ask...
> The patches (applying to bluez package) that are part of this submission, also needs to be changed to a 4 spaces tab?
No, only the metadata (.bbclass, .bb, .inc, .conf) files are using 4
spaces, patches should follow whatever convention the component is
using.
> I do agree on the others, I am not sure if it would be ok to alter the original patches.
> Also, I did not know the difference in policies of OE versus oe-core, sorry, my fault.
See http://www.openembedded.org/wiki/Styleguide
Cheers,
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of Martin Jansa
> Sent: Tuesday, April 7, 2015 1:57 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [meta-oe][PATCH] bluez collection: add (moved from oe-core)
>
> On Mon, Apr 06, 2015 at 07:21:49AM +0000, Iorga, Cristian wrote:
> > No, I intended to place it exactly where it is in the patch.
>
> Then improve the commit message and fix indentation (use 4 spaces instead of tabs).
>
> > -----Original Message-----
> > From: openembedded-devel-bounces@lists.openembedded.org
> > [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf
> > Of Martin Jansa
> > Sent: Friday, April 3, 2015 8:45 PM
> > To: openembedded-devel@lists.openembedded.org
> > Subject: Re: [oe] [meta-oe][PATCH] bluez collection: add (moved from
> > oe-core)
> >
> > On Fri, Apr 03, 2015 at 05:16:48PM +0300, Cristian Iorga wrote:
> > > BlueZ 4.x Bluetooth stack has been removed from oe-core.
> > > However, it is still supported, so add it to meta-oe networking layer.
> >
> > "meta-oe netwrorking layer" is very confusing, did you plan to put it in meta-networking?
> >
> > > In order to use it in oe-core/poky/YP 'bluez4' needs to be added to
> > > distro features. 'bluetooth' distro feature needs to be present also.
> > >
> > > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
> > > ---
> > > .../obsolete_automake_macros.patch | 14 +++++++
> > > .../bluez/bluez-hcidump_2.5.bb | 22 +++++++++++
> > > .../bluez/bluez4-4.101/bluetooth.conf | 16 ++++++++
> > > .../bluez/bluez4-4.101/fix-udev-paths.patch | 37 +++++++++++++++++
> > > .../bluez/bluez4-4.101/install-test-script.patch | 26 ++++++++++++
> > > ...ork-fix-network-Connect-method-parameters.patch | 30 ++++++++++++++
> > > .../bluez4-4.101/obsolete_automake_macros.patch | 14 +++++++
> > > .../bluez/bluez4-4.101/sbc_mmx.patch | 24 +++++++++++
> > > ...pygobject-instead-ofgobject-introspection.patch | 27 +++++++++++++
> > > meta-oe/recipes-connectivity/bluez/bluez4.inc | 46 ++++++++++++++++++++++
> > > meta-oe/recipes-connectivity/bluez/bluez4_4.101.bb | 46 ++++++++++++++++++++++
> > > .../bluez/gst-plugin-bluetooth_4.101.bb | 39 ++++++++++++++++++
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-04-08 11:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-03 14:16 [meta-oe][PATCH] bluez collection: add (moved from oe-core) Cristian Iorga
2015-04-03 17:45 ` Martin Jansa
2015-04-06 7:21 ` Iorga, Cristian
2015-04-07 10:57 ` Martin Jansa
2015-04-08 11:05 ` Iorga, Cristian
2015-04-08 11:18 ` Martin Jansa
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.