* [PATCHv4 1/7] bluez5: Upgrade 5.43 -> 5.44
2017-04-25 14:48 [PATCHv4 0/7] bluez: upgrade and refactoring Marc Ferland
@ 2017-04-25 14:48 ` Marc Ferland
2017-04-25 14:48 ` [PATCHv4 2/7] bluez5: remove libasound-module references Marc Ferland
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Marc Ferland @ 2017-04-25 14:48 UTC (permalink / raw)
To: openembedded-core
New feautures/fixes in this version:
* fixes to BLE
* a new midi plugin
* support for single-mode controllers w/o public address
* most of the experimental tools have been promoted and are now part of
the official tools
* 'experimental' has been renamed to 'testing' (hence the addition of
the 'testing' package config option)
* classic command line tools like hciattach and hciconfig are now enabled
by the "--enable-deprecated" configure option (enabled by default for
backward compatibility).
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 9 ++--
meta/recipes-connectivity/bluez5/bluez5_5.43.bb | 55 --------------------
meta/recipes-connectivity/bluez5/bluez5_5.44.bb | 68 +++++++++++++++++++++++++
3 files changed, 74 insertions(+), 58 deletions(-)
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.43.bb
create mode 100644 meta/recipes-connectivity/bluez5/bluez5_5.44.bb
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index ed75db2..11cf8fb 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -14,8 +14,8 @@ RCONFLICTS_${PN} = "bluez4"
PACKAGECONFIG ??= "obex-profiles readline"
PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
-PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
+PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
SRC_URI = "\
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -31,6 +31,7 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
EXTRA_OECONF = "\
--enable-tools \
+ --enable-deprecated \
--disable-cups \
--enable-test \
--enable-datafiles \
@@ -41,10 +42,12 @@ EXTRA_OECONF = "\
# bluez5 builds a large number of useful utilities but does not
# install them. Specify which ones we want put into ${PN}-noinst-tools.
NOINST_TOOLS_READLINE ??= ""
-NOINST_TOOLS_EXPERIMENTAL ??= ""
+NOINST_TOOLS_TESTING ??= ""
+NOINST_TOOLS_BT ??= ""
NOINST_TOOLS = " \
${@bb.utils.contains('PACKAGECONFIG', 'readline', '${NOINST_TOOLS_READLINE}', '', d)} \
- ${@bb.utils.contains('PACKAGECONFIG', 'experimental', '${NOINST_TOOLS_EXPERIMENTAL}', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'testing', '${NOINST_TOOLS_TESTING}', '', d)} \
+ ${NOINST_TOOLS_BT} \
"
do_install_append() {
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb b/meta/recipes-connectivity/bluez5/bluez5_5.43.bb
deleted file mode 100644
index e10b82d..0000000
--- a/meta/recipes-connectivity/bluez5/bluez5_5.43.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-require bluez5.inc
-
-REQUIRED_DISTRO_FEATURES = "bluez5"
-
-SRC_URI[md5sum] = "698def88df96840dfbb0858bb6d73350"
-SRC_URI[sha256sum] = "16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15"
-
-# noinst programs in Makefile.tools that are conditional on READLINE
-# support
-NOINST_TOOLS_READLINE ?= " \
- attrib/gatttool \
- tools/obex-client-tool \
- tools/obex-server-tool \
- tools/bluetooth-player \
- tools/obexctl \
- tools/btmgmt \
-"
-
-# noinst programs in Makefile.tools that are conditional on EXPERIMENTAL
-# support
-NOINST_TOOLS_EXPERIMENTAL ?= " \
- emulator/btvirt \
- emulator/b1ee \
- emulator/hfp \
- tools/3dsp \
- tools/mgmt-tester \
- tools/gap-tester \
- tools/l2cap-tester \
- tools/sco-tester \
- tools/smp-tester \
- tools/hci-tester \
- tools/rfcomm-tester \
- tools/bdaddr \
- tools/avinfo \
- tools/avtest \
- tools/scotest \
- tools/amptest \
- tools/hwdb \
- tools/hcieventmask \
- tools/hcisecfilter \
- tools/btinfo \
- tools/btattach \
- tools/btsnoop \
- tools/btproxy \
- tools/btiotest \
- tools/mcaptest \
- tools/cltest \
- tools/oobtest \
- tools/seq2bseq \
- tools/ibeacon \
- tools/btgatt-client \
- tools/btgatt-server \
- tools/gatt-service \
- profiles/iap/iapd \
-"
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.44.bb b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
new file mode 100644
index 0000000..1095f88
--- /dev/null
+++ b/meta/recipes-connectivity/bluez5/bluez5_5.44.bb
@@ -0,0 +1,68 @@
+require bluez5.inc
+
+REQUIRED_DISTRO_FEATURES = "bluez5"
+
+SRC_URI[md5sum] = "94273617129ced06612fcb9f5273d14c"
+SRC_URI[sha256sum] = "0c321e291f8b45e6a78e379dfe80592b65955a0f0ab191f1cca0edd8ec356c85"
+
+# noinst programs in Makefile.tools that are conditional on READLINE
+# support
+NOINST_TOOLS_READLINE ?= " \
+ attrib/gatttool \
+ tools/obex-client-tool \
+ tools/obex-server-tool \
+ tools/bluetooth-player \
+ tools/obexctl \
+ tools/btmgmt \
+"
+
+# noinst programs in Makefile.tools that are conditional on TESTING
+# support
+NOINST_TOOLS_TESTING ?= " \
+ emulator/btvirt \
+ emulator/b1ee \
+ emulator/hfp \
+ peripheral/btsensor \
+ tools/3dsp \
+ tools/mgmt-tester \
+ tools/gap-tester \
+ tools/l2cap-tester \
+ tools/sco-tester \
+ tools/smp-tester \
+ tools/hci-tester \
+ tools/rfcomm-tester \
+ tools/bnep-tester \
+ tools/userchan-tester \
+"
+
+# noinst programs in Makefile.tools that are conditional on TOOLS
+# support
+NOINST_TOOLS_BT ?= " \
+ tools/bdaddr \
+ tools/avinfo \
+ tools/avtest \
+ tools/scotest \
+ tools/amptest \
+ tools/hwdb \
+ tools/hcieventmask \
+ tools/hcisecfilter \
+ tools/btinfo \
+ tools/btsnoop \
+ tools/btproxy \
+ tools/btiotest \
+ tools/bneptest \
+ tools/mcaptest \
+ tools/cltest \
+ tools/oobtest \
+ tools/seq2bseq \
+ tools/nokfw \
+ tools/create-image \
+ tools/eddystone \
+ tools/ibeacon \
+ tools/btgatt-client \
+ tools/btgatt-server \
+ tools/test-runner \
+ tools/check-selftest \
+ tools/gatt-service \
+ profiles/iap/iapd \
+"
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCHv4 2/7] bluez5: remove libasound-module references
2017-04-25 14:48 [PATCHv4 0/7] bluez: upgrade and refactoring Marc Ferland
2017-04-25 14:48 ` [PATCHv4 1/7] bluez5: Upgrade 5.43 -> 5.44 Marc Ferland
@ 2017-04-25 14:48 ` Marc Ferland
2017-04-25 14:48 ` [PATCHv4 3/7] bluez5: add PACKAGECONFIG option for midi Marc Ferland
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Marc Ferland @ 2017-04-25 14:48 UTC (permalink / raw)
To: openembedded-core
Cleanup references to libasound-module since this code has been
completly removed from Bluez.
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
meta/conf/distro/include/default-providers.inc | 1 -
meta/recipes-connectivity/bluez5/bluez5.inc | 5 +----
meta/recipes-core/packagegroups/packagegroup-base.bb | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index ece4d8b..e1cb2f9 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -46,7 +46,6 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
PREFERRED_PROVIDER_console-tools ?= "kbd"
PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
-PREFERRED_RPROVIDER_libasound-module-bluez ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}"
PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}"
# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
PREFERRED_PROVIDER_ltp ?= "ltp"
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 11cf8fb..4244fc8 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -79,14 +79,11 @@ do_install_append() {
sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
}
-ALLOW_EMPTY_libasound-module-bluez = "1"
-PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
+PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
-FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa"
FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1"
FILES_${PN}-dev += "\
${libdir}/bluetooth/plugins/*.la \
- ${libdir}/alsa-lib/*.la \
"
FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 0069e3e..f9e6e2e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -204,7 +204,7 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
SUMMARY_packagegroup-base-bluetooth = "Bluetooth support"
RDEPENDS_packagegroup-base-bluetooth = "\
${BLUEZ} \
- ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
+ ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', bb.utils.contains('BLUEZ', 'bluez4', 'libasound-module-bluez', '', d), '',d)} \
"
RRECOMMENDS_packagegroup-base-bluetooth = "\
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCHv4 3/7] bluez5: add PACKAGECONFIG option for midi
2017-04-25 14:48 [PATCHv4 0/7] bluez: upgrade and refactoring Marc Ferland
2017-04-25 14:48 ` [PATCHv4 1/7] bluez5: Upgrade 5.43 -> 5.44 Marc Ferland
2017-04-25 14:48 ` [PATCHv4 2/7] bluez5: remove libasound-module references Marc Ferland
@ 2017-04-25 14:48 ` Marc Ferland
2017-04-25 14:48 ` [PATCHv4 4/7] bluez5: add PACKAGECONFIG option for systemd Marc Ferland
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Marc Ferland @ 2017-04-25 14:48 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 4244fc8..687656e 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -16,6 +16,7 @@ PACKAGECONFIG ??= "obex-profiles readline"
PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
+PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
SRC_URI = "\
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCHv4 4/7] bluez5: add PACKAGECONFIG option for systemd
2017-04-25 14:48 [PATCHv4 0/7] bluez: upgrade and refactoring Marc Ferland
` (2 preceding siblings ...)
2017-04-25 14:48 ` [PATCHv4 3/7] bluez5: add PACKAGECONFIG option for midi Marc Ferland
@ 2017-04-25 14:48 ` Marc Ferland
2017-04-25 15:13 ` Martin Jansa
2017-04-25 14:48 ` [PATCHv4 5/7] bluez5: add PACKAGECONFIG option for cups Marc Ferland
` (2 subsequent siblings)
6 siblings, 1 reply; 10+ messages in thread
From: Marc Ferland @ 2017-04-25 14:48 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 687656e..71a5016 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -12,11 +12,12 @@ RPROVIDES_${PN} += "bluez-hcidump"
RCONFLICTS_${PN} = "bluez4"
-PACKAGECONFIG ??= "obex-profiles readline"
+PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
SRC_URI = "\
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -36,7 +37,6 @@ EXTRA_OECONF = "\
--disable-cups \
--enable-test \
--enable-datafiles \
- ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \
--enable-library \
"
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCHv4 4/7] bluez5: add PACKAGECONFIG option for systemd
2017-04-25 14:48 ` [PATCHv4 4/7] bluez5: add PACKAGECONFIG option for systemd Marc Ferland
@ 2017-04-25 15:13 ` Martin Jansa
2017-04-25 16:30 ` Marc Ferland
0 siblings, 1 reply; 10+ messages in thread
From: Martin Jansa @ 2017-04-25 15:13 UTC (permalink / raw)
To: Marc Ferland; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1753 bytes --]
On Tue, Apr 25, 2017 at 10:48:37AM -0400, Marc Ferland wrote:
> Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
> ---
> meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
> index 687656e..71a5016 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5.inc
> +++ b/meta/recipes-connectivity/bluez5/bluez5.inc
> @@ -12,11 +12,12 @@ RPROVIDES_${PN} += "bluez-hcidump"
>
> RCONFLICTS_${PN} = "bluez4"
>
> -PACKAGECONFIG ??= "obex-profiles readline"
> +PACKAGECONFIG ??= "obex-profiles readline ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
> PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
> PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
> PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
> +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
>
> SRC_URI = "\
> ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
> @@ -36,7 +37,6 @@ EXTRA_OECONF = "\
> --disable-cups \
> --enable-test \
> --enable-datafiles \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd', '--disable-systemd', d)} \
Why not use just the options from PACKAGECONFIG?
> --enable-library \
> "
>
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCHv4 4/7] bluez5: add PACKAGECONFIG option for systemd
2017-04-25 15:13 ` Martin Jansa
@ 2017-04-25 16:30 ` Marc Ferland
0 siblings, 0 replies; 10+ messages in thread
From: Marc Ferland @ 2017-04-25 16:30 UTC (permalink / raw)
To: Martin Jansa; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 2138 bytes --]
On Tue, Apr 25, 2017 at 11:13 AM, Martin Jansa <martin.jansa@gmail.com>
wrote:
>
> On Tue, Apr 25, 2017 at 10:48:37AM -0400, Marc Ferland wrote:
> > Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
> > ---
> > meta/recipes-connectivity/bluez5/bluez5.inc | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc
b/meta/recipes-connectivity/bluez5/bluez5.inc
> > index 687656e..71a5016 100644
> > --- a/meta/recipes-connectivity/bluez5/bluez5.inc
> > +++ b/meta/recipes-connectivity/bluez5/bluez5.inc
> > @@ -12,11 +12,12 @@ RPROVIDES_${PN} += "bluez-hcidump"
> >
> > RCONFLICTS_${PN} = "bluez4"
> >
> > -PACKAGECONFIG ??= "obex-profiles readline"
> > +PACKAGECONFIG ??= "obex-profiles readline
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> > PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
> > PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
> > PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
> > PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
> > +PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
> >
> > SRC_URI = "\
> > ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
> > @@ -36,7 +37,6 @@ EXTRA_OECONF = "\
> > --disable-cups \
> > --enable-test \
> > --enable-datafiles \
> > - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd',
'--enable-systemd', '--disable-systemd', d)} \
>
> Why not use just the options from PACKAGECONFIG?
>
> > --enable-library \
> > "
enable-library builds and installs the libbluetooth library along with
the header files. I guess it's something pretty much everyone
wants/expects, a sane default, probably also why it was "hard-coded"
in EXTRA_OECONF.
There are many other build options in bluez5 which aren't exposed as
PACKAGECONFIG options. The majority of them being for more finer
grained stuff (the current options are mostly for obvious external
dependencies).
I'll take a look at it and come up with a separate patch if that's okay.
Marc
[-- Attachment #2: Type: text/html, Size: 2759 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCHv4 5/7] bluez5: add PACKAGECONFIG option for cups
2017-04-25 14:48 [PATCHv4 0/7] bluez: upgrade and refactoring Marc Ferland
` (3 preceding siblings ...)
2017-04-25 14:48 ` [PATCHv4 4/7] bluez5: add PACKAGECONFIG option for systemd Marc Ferland
@ 2017-04-25 14:48 ` Marc Ferland
2017-04-25 14:48 ` [PATCHv4 6/7] bluez5: do not install audio.conf Marc Ferland
2017-04-25 14:48 ` [PATCHv4 7/7] bluez5: cleanup tabs and spaces Marc Ferland
6 siblings, 0 replies; 10+ messages in thread
From: Marc Ferland @ 2017-04-25 14:48 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 71a5016..c8a240f 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -18,6 +18,7 @@ PACKAGECONFIG[readline] = "--enable-client,--disable-client,readline,"
PACKAGECONFIG[testing] = "--enable-testing,--disable-testing"
PACKAGECONFIG[midi] = "--enable-midi,--disable-midi,alsa-lib"
PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
+PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,,cups"
SRC_URI = "\
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
@@ -34,7 +35,6 @@ inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
EXTRA_OECONF = "\
--enable-tools \
--enable-deprecated \
- --disable-cups \
--enable-test \
--enable-datafiles \
--enable-library \
@@ -82,7 +82,11 @@ do_install_append() {
PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
-FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${systemd_unitdir}/ ${datadir}/dbus-1"
+FILES_${PN} += " \
+ ${libdir}/bluetooth/plugins/*.so \
+ ${systemd_unitdir}/ ${datadir}/dbus-1 \
+ ${libdir}/cups \
+"
FILES_${PN}-dev += "\
${libdir}/bluetooth/plugins/*.la \
"
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCHv4 6/7] bluez5: do not install audio.conf
2017-04-25 14:48 [PATCHv4 0/7] bluez: upgrade and refactoring Marc Ferland
` (4 preceding siblings ...)
2017-04-25 14:48 ` [PATCHv4 5/7] bluez5: add PACKAGECONFIG option for cups Marc Ferland
@ 2017-04-25 14:48 ` Marc Ferland
2017-04-25 14:48 ` [PATCHv4 7/7] bluez5: cleanup tabs and spaces Marc Ferland
6 siblings, 0 replies; 10+ messages in thread
From: Marc Ferland @ 2017-04-25 14:48 UTC (permalink / raw)
To: openembedded-core
The audio.conf file has been removed, stop installing it.
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index c8a240f..47d8f22 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -56,9 +56,6 @@ do_install_append() {
install -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/bluetooth
install -d ${D}${sysconfdir}/bluetooth/
- if [ -f ${S}/profiles/audio/audio.conf ]; then
- install -m 0644 ${S}/profiles/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
- fi
if [ -f ${S}/profiles/network/network.conf ]; then
install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
fi
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCHv4 7/7] bluez5: cleanup tabs and spaces
2017-04-25 14:48 [PATCHv4 0/7] bluez: upgrade and refactoring Marc Ferland
` (5 preceding siblings ...)
2017-04-25 14:48 ` [PATCHv4 6/7] bluez5: do not install audio.conf Marc Ferland
@ 2017-04-25 14:48 ` Marc Ferland
6 siblings, 0 replies; 10+ messages in thread
From: Marc Ferland @ 2017-04-25 14:48 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Marc Ferland <ferlandm@amotus.ca>
---
meta/recipes-connectivity/bluez5/bluez5.inc | 30 ++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 47d8f22..01ade7d 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -57,24 +57,24 @@ do_install_append() {
install -d ${D}${sysconfdir}/bluetooth/
if [ -f ${S}/profiles/network/network.conf ]; then
- install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
+ install -m 0644 ${S}/profiles/network/network.conf ${D}/${sysconfdir}/bluetooth/
fi
if [ -f ${S}/profiles/input/input.conf ]; then
- install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
+ install -m 0644 ${S}/profiles/input/input.conf ${D}/${sysconfdir}/bluetooth/
fi
- if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
- sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
- fi
+ if [ -f ${D}/${sysconfdir}/init.d/bluetooth ]; then
+ sed -i -e 's#@LIBEXECDIR@#${libexecdir}#g' ${D}/${sysconfdir}/init.d/bluetooth
+ fi
# Install desired tools that upstream leaves in build area
- for f in ${NOINST_TOOLS} ; do
- install -m 755 ${B}/$f ${D}/${bindir}
+ for f in ${NOINST_TOOLS} ; do
+ install -m 755 ${B}/$f ${D}/${bindir}
done
- # Patch python tools to use Python 3; they should be source compatible, but
- # still refer to Python 2 in the shebang
- sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
+ # Patch python tools to use Python 3; they should be source compatible, but
+ # still refer to Python 2 in the shebang
+ sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/bluez/test/*
}
PACKAGES =+ "${PN}-testtools ${PN}-obex ${PN}-noinst-tools"
@@ -84,8 +84,8 @@ FILES_${PN} += " \
${systemd_unitdir}/ ${datadir}/dbus-1 \
${libdir}/cups \
"
-FILES_${PN}-dev += "\
- ${libdir}/bluetooth/plugins/*.la \
+FILES_${PN}-dev += " \
+ ${libdir}/bluetooth/plugins/*.la \
"
FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \
@@ -115,10 +115,10 @@ INITSCRIPT_NAME_${PN} = "bluetooth"
EXCLUDE_FROM_WORLD = "1"
do_compile_ptest() {
- oe_runmake buildtests
+ oe_runmake buildtests
}
do_install_ptest() {
- cp -r ${B}/unit/ ${D}${PTEST_PATH}
- rm -f ${D}${PTEST_PATH}/unit/*.o
+ cp -r ${B}/unit/ ${D}${PTEST_PATH}
+ rm -f ${D}${PTEST_PATH}/unit/*.o
}
--
2.7.4
^ permalink raw reply related [flat|nested] 10+ messages in thread