linux-firmware: fix FILES to drop RDEPENDS on full package

From: pseregiet <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(-)

On Tue, Apr 22, 2025 at 10:25 PM patryk.seregiet via
lists.openembedded.org
<patryk.seregiet=gmail.com@lists.openembedded.org> wrote:
>
> From: pseregiet <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..7e5c4e25a0 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb
> @@ -1253,6 +1253,7 @@ FILES:${PN}-rtl8723 = " \
>    ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin* \
>    ${nonarch_base_libdir}/firmware/rtw88/rtw8723*.bin* \
>    ${nonarch_base_libdir}/firmware/rtl_bt/rtl8723*.bin* \
> +  ${nonarch_base_libdir}/firmware/rtl_bt/rtl8821c_config.bin \

I think Peter's suggestion was correct - that file (or pattern) should
be part of linux-firmware-rtl8821, not linux-firmware-rtl8723:

  My guess is that the files matching
  ${nonarch_base_libdir}/firmware/rtl_bt/rtl8821* should be included in
  the ${PN}-rtl8821 package instead.


>  "
>  FILES:${PN}-rtl8821 = " \
>    ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.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
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#215247): https://lists.openembedded.org/g/openembedded-core/message/215247
> Mute This Topic: https://lists.openembedded.org/mt/112403940/3618097
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kiernan@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


--
Alex Kiernan

Hi,

Yes I agree, makes sense. This causes rtl-8723 to RDEPEND on rtl-8821
which is fine. I'll send an updated patch

Pozdrawiam / Best Regards
Patryk Seregiet

śr., 23 kwi 2025 o 09:32 Alex Kiernan <alex.kiernan@gmail.com> napisał(a):
>
> On Tue, Apr 22, 2025 at 10:25 PM patryk.seregiet via
> lists.openembedded.org
> <patryk.seregiet=gmail.com@lists.openembedded.org> wrote:
> >
> > From: pseregiet <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..7e5c4e25a0 100644
> > --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb
> > +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb
> > @@ -1253,6 +1253,7 @@ FILES:${PN}-rtl8723 = " \
> >    ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin* \
> >    ${nonarch_base_libdir}/firmware/rtw88/rtw8723*.bin* \
> >    ${nonarch_base_libdir}/firmware/rtl_bt/rtl8723*.bin* \
> > +  ${nonarch_base_libdir}/firmware/rtl_bt/rtl8821c_config.bin \
>
> I think Peter's suggestion was correct - that file (or pattern) should
> be part of linux-firmware-rtl8821, not linux-firmware-rtl8723:
>
>   My guess is that the files matching
>   ${nonarch_base_libdir}/firmware/rtl_bt/rtl8821* should be included in
>   the ${PN}-rtl8821 package instead.
>
>
> >  "
> >  FILES:${PN}-rtl8821 = " \
> >    ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.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
> >
> >
> > 
> >
>
>
> --
> Alex Kiernan

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of patryk.seregiet via lists.openembedded.org
> Sent: den 22 april 2025 23:25
> To: openembedded-core@lists.openembedded.org
> Cc: pseregiet <patryk.seregiet@gmail.com>
> Subject: [OE-core] [PATCH] linux-firmware: fix FILES to drop RDEPENDS on full package
> 
> From: pseregiet <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..7e5c4e25a0 100644
> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb
> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20250410.bb
> @@ -1253,6 +1253,7 @@ FILES:${PN}-rtl8723 = " \
>    ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin* \
>    ${nonarch_base_libdir}/firmware/rtw88/rtw8723*.bin* \
>    ${nonarch_base_libdir}/firmware/rtl_bt/rtl8723*.bin* \
> +  ${nonarch_base_libdir}/firmware/rtl_bt/rtl8821c_config.bin \

I believe it would make more sense to package 
${nonarch_base_libdir}/firmware/rtl_bt/rtl8821*
in ${PN}-rtl8821 instead. That would match how it is done for 
${PN}-rtl8723 and ${PN}-rtl8822.

>  "
>  FILES:${PN}-rtl8821 = " \
>    ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.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