From cf27c7d040e7a5f1bbc60fb36c98686704bd7dc5 Mon Sep 17 00:00:00 2001 From: Patryk Seregiet Date: Wed, 23 Apr 2025 15:02:45 +0200 Subject: [PATCH] linux-firmware: fix FILES to drop RDEPENDS on full package linux-firmware-rtl8723 and linux-firmware-adsp-sst contain symlinks to files that were previously packaged only in the main linux-firmware package. This caused both subpackages to inherit an unintended RDEPENDS on the full package. This change resolves the issue by ensuring all required files are correctly included in their respective subpackages. Thanks to Peter Kjellerstedt for figuring out the rootcause. Signed-off-by: Patryk Seregiet Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../linux-firmware/linux-firmware_20250410.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb index 5dd178c03e3..e9491a74bdf 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb @@ -1259,6 +1259,7 @@ FILES:${PN}-rtl8723 = " \ FILES:${PN}-rtl8821 = " \ ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin* \ ${nonarch_base_libdir}/firmware/rtw88/rtw8821*.bin* \ + ${nonarch_base_libdir}/firmware/rtl_bt/rtl8821*.bin \ " FILES:${PN}-rtl8761 = " \ ${nonarch_base_libdir}/firmware/rtl_bt/rtl8761*.bin* \ @@ -1762,7 +1763,10 @@ RDEPENDS:${PN}-ice = "${PN}-ice-license" FILES:${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst" LICENSE:${PN}-adsp-sst = "Firmware-adsp_sst" LICENSE:${PN}-adsp-sst-license = "Firmware-adsp_sst" -FILES:${PN}-adsp-sst = "${nonarch_base_libdir}/firmware/intel/dsp_fw*" +FILES:${PN}-adsp-sst = "\ + ${nonarch_base_libdir}/firmware/intel/dsp_fw* \ + ${nonarch_base_libdir}/firmware/intel/avs/*/dsp_basefw.bin \ +" RDEPENDS:${PN}-adsp-sst = "${PN}-adsp-sst-license" # For QAT -- 2.47.3