From 903346fe9876be467696c5c481ca8dce27a7724f Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 1 Dec 2018 11:58:58 +0100
Subject: [PATCH] bluez: symlink /etc/firmware to /usr/lib/firmware

This enables bluez/hciattach to use firmware files added by the
kernel overlay system.

Also move /etc/firmware symlink creation from linux to bluez,
the linux kernel package shouldn't need to care about quirks needed
by other packages.

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/linux/package.mk         | 3 ---
 packages/network/bluez/package.mk | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index b17be702c2..7eba1e703c 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -298,9 +298,6 @@ post_install() {
   mkdir -p $INSTALL/$(get_full_firmware_dir)/
     ln -sf /storage/.config/firmware/ $INSTALL/$(get_full_firmware_dir)/updates
 
-  # bluez looks in /etc/firmware/
-    ln -sf /$(get_full_firmware_dir)/ $INSTALL/etc/firmware
-
   # regdb and signature is now loaded as firmware by 4.15+
     if grep -q ^CONFIG_CFG80211_REQUIRE_SIGNED_REGDB= $PKG_BUILD/.config; then
       cp $(get_build_dir wireless-regdb)/regulatory.db{,.p7s} $INSTALL/$(get_full_firmware_dir)
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index 5f21f5d8dc..a208a1d3f3 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -59,6 +59,9 @@ post_makeinstall_target() {
 
   mkdir -p $INSTALL/usr/share/services
     cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services
+
+  # bluez looks in /etc/firmware/
+    ln -sf /usr/lib/firmware $INSTALL/etc/firmware
 }
 
 post_install() {