[meta-lsi] [PATCH 20/24] bluez: Force to use version bluez5 instead of bluez4

[Daniel Dragomir]

If bluez5 is just added in IMAGE_INSTALL, both versions of bluez
package will be compiled and this will cause some warnings and errors
because both pachages are trying to install same files in same locations:

WARNING: The recipe bluez4/bluez5 is trying to install files into a
shared area when those files already exist.
ERROR: Recipe bluez4 is trying to change PR from 'r5' to 'r0'. This
will cause do_package_write_* failures since the incorrect data will
be used and they will be unable to find the right workdir.
ERROR: Function failed: read_subpackage_metadata

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 recipes-connectivity/libpcap/libpcap_1.6.1.bbappend        | 1 +
 recipes-core/images/axxia-image-large.bb                   | 3 +--
 recipes-core/packagegroups/packagegroup-core-large-boot.bb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 recipes-connectivity/libpcap/libpcap_1.6.1.bbappend

diff --git a/recipes-connectivity/libpcap/libpcap_1.6.1.bbappend b/recipes-connectivity/libpcap/libpcap_1.6.1.bbappend
new file mode 100644
index 0000000..30ffe44
--- /dev/null
+++ b/recipes-connectivity/libpcap/libpcap_1.6.1.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez5"
diff --git a/recipes-core/images/axxia-image-large.bb b/recipes-core/images/axxia-image-large.bb
index 0f4fd11..3a91eb2 100644
--- a/recipes-core/images/axxia-image-large.bb
+++ b/recipes-core/images/axxia-image-large.bb
@@ -33,8 +33,7 @@ bc \
 beecrypt \
 bind \
 bison \
-bluez4 \
-bluez-hcidump \
+bluez5 \
 busybox \
 bzip2 \
 coreutils \
diff --git a/recipes-core/packagegroups/packagegroup-core-large-boot.bb b/recipes-core/packagegroups/packagegroup-core-large-boot.bb
index 3fb40af..351c665 100644
--- a/recipes-core/packagegroups/packagegroup-core-large-boot.bb
+++ b/recipes-core/packagegroups/packagegroup-core-large-boot.bb
@@ -106,7 +106,7 @@ RDEPENDS_${PN} = "\
     setserial \
     tcp-wrappers \
     mdadm \
-    bluez4 \
+    bluez5 \
     groff \
     iptables \
     elfutils \
-- 
1.9.1