From 6a7606a1e45444cdd5b6782208bbe9ed8603b584 Mon Sep 17 00:00:00 2001
From: Michael Gloff <mgloff@hotmail.com>
Date: Wed, 25 Oct 2017 22:59:32 -0500
Subject: [PATCH] bluez5: Replace /lib with ${nonarch_base_libdir}

Use standard /lib variable name and avoid
QA errors when usermerge DISTRO_FEATURE is enabled.

Signed-off-by: Michael Gloff <mgloff@hotmail.com>
---
 recipes-connectivity/bluez5/bluez5_%.bbappend | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-connectivity/bluez5/bluez5_%.bbappend b/recipes-connectivity/bluez5/bluez5_%.bbappend
index 03efd5c..eac8d40 100644
--- a/recipes-connectivity/bluez5/bluez5_%.bbappend
+++ b/recipes-connectivity/bluez5/bluez5_%.bbappend
@@ -10,8 +10,8 @@ BCM_BT_SOURCES =  " \
     "
 
 enable_bcm_bluetooth() {
-    install -d ${D}/lib/firmware/brcm/
-    install -m 0644 ${WORKDIR}/BCM43430A1.hcd ${D}/lib/firmware/brcm/BCM43430A1.hcd
+    install -d ${D}${nonarch_base_libdir}/firmware/brcm/
+    install -m 0644 ${WORKDIR}/BCM43430A1.hcd ${D}${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${systemd_unitdir}/system
@@ -20,7 +20,7 @@ enable_bcm_bluetooth() {
 }
 
 BCM_BT_FIRMWARE =  " \
-    /lib/firmware/brcm/BCM43430A1.hcd \
+    ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \
     "
 
 BCM_BT_SERVICE =  " brcm43438.service"