From: Ross Burton <ross.burton@arm.com>
Date: Wed, 29 Apr 2026 16:48:14 +0000 (+0100)
Subject: bluez5: use ${firmwaredir} instead of ${nonarch_base_libdir}/firmware
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d683da53a4bc4fbb9592fcf78f21bc9219673bb8;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

bluez5: use ${firmwaredir} instead of ${nonarch_base_libdir}/firmware

Now that firmwaredir has been defined, use it instead of explicitly using
${nonarch_base_libdir}/firmware.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 843e36b78d..676d2c58eb 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -85,7 +85,7 @@ EXTRA_OECONF = "\
   --without-zsh-completion-dir \
 "
 
-CFLAGS += "-DFIRMWARE_DIR='"${nonarch_base_libdir}/firmware"'"
+CFLAGS += "-DFIRMWARE_DIR='"${firmwaredir}"'"
 
 # bluez5 builds a large number of useful utilities but does not
 # install them.  Specify which ones we want put into ${PN}-noinst-tools.