From a02a10d26337f4c75f0b3ea2f3f1dbd054565e83 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Wed, 4 Dec 2019 09:35:23 +0100
Subject: [PATCH] linux: clean up firmware dependecies

The fw packages are accessed using get_build_dir(), so move then to
PKG_DEPENDS_UNPACK.
---
 config/options            | 1 -
 packages/linux/package.mk | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/options b/config/options
index 8e55002736..4b461a321a 100644
--- a/config/options
+++ b/config/options
@@ -56,7 +56,6 @@ KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
 
 LINUX_DEPENDS="${PROJECT_DIR}/${PROJECT}/linux ${PROJECT_DIR}/${PROJECT}/patches/linux ${PROJECT_DIR}/${PROJECT}/packages/linux ${ROOT}/packages/linux"
 [ -n "${DEVICE}" ] && LINUX_DEPENDS+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/linux"
-[ "${TARGET_ARCH}" = "x86_64" ] && LINUX_DEPENDS+=" ${ROOT}/packages/linux-firmware/intel-ucode ${ROOT}/packages/linux-firmware/kernel-firmware"
 
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC does not point to it
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 0b2346b26e..d35795603e 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -50,7 +50,8 @@ if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG
 fi
 
 if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode:host kernel-firmware elfutils:host pciutils"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET elfutils:host pciutils"
+  PKG_DEPENDS_UNPACK+=" intel-ucode kernel-firmware"
 fi
 
 if [[ "$KERNEL_TARGET" = uImage* ]]; then