| Message ID | 20250423122619.109306-1-patryk.seregiet@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] linux-firmware: fix FILES to drop RDEPENDS on full package | expand |
> -----Original Message----- > From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of patryk.seregiet via lists.openembedded.org > Sent: den 23 april 2025 14:26 > To: openembedded-core@lists.openembedded.org > Cc: Patryk Seregiet <patryk.seregiet@gmail.com> > Subject: [OE-core] [PATCH v2] linux-firmware: fix FILES to drop RDEPENDS on full package > > From: Patryk Seregiet <patryk.seregiet@gmail.com> > > 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 <patryk.seregiet@gmail.com> > --- > .../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 f12bb2c6d3..a548645f00 100644 > --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb > +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb > @@ -1257,6 +1257,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/rtl8821c_config.bin \ My recommendation was to include all the related 8821 files, i.e.: ${nonarch_base_libdir}/firmware/rtl_bt/rtl8821*.bin \ It feels weird to only include one specific file, especially as it is not used by any other file in that package unless all the rtl_bt/rtl8821*.bin files are included. > " > FILES:${PN}-rtl8761 = " \ > ${nonarch_base_libdir}/firmware/rtl_bt/rtl8761*.bin* \ > @@ -1760,7 +1761,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.49.0 //Peter
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb index f12bb2c6d3..a548645f00 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb @@ -1257,6 +1257,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/rtl8821c_config.bin \ " FILES:${PN}-rtl8761 = " \ ${nonarch_base_libdir}/firmware/rtl_bt/rtl8761*.bin* \ @@ -1760,7 +1761,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