[master,v2] linux-firmware-arago: correct removal of overlapping FW

From: Denys Dmytriyenko <denys@konsulko.com>

Use the correct variable, instead of hard-coding /lib/firmware, when
removing firmware images that overlap with the ones from meta-ti-bsp.
This way it will work properly even when usrmerge is enabled.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
v2 - separate patches for master and scarthgap

 .../recipes-kernel/linux-firmware/linux-firmware-arago.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

meta-arago / na / 20250925193019.2938469-1-denis

PRC Results: PASS

=========================================================
  check-yocto-patches: PASS
=========================================================
Patches
----------------------------------------
WARN - [master][PATCH v2] linux-firmware-arago: correct removal of overlapping FW
    WARN: Commit message does not include file/recipe name: linux-firmware-arago: correct removal of overlapping FW. (COMMIT-MESSAGE-2)
        patch
    
    WARN: Revised patch missing a comment. (REVISION-1)
        patch



=========================================================
  apply-yocto-patch: PASS
=========================================================
master
=====================
Summary:
- Patch Series: [master][PATCH v2] linux-firmware-arago: correct removal of overlapping FW
- Submitter: From: Denys Dmytriyenko <denis@denix.org>
From: Denys Dmytriyenko <denys@konsulko.com>
- Date: Date: Thu, 25 Sep 2025 15:30:19 -0400
- Num Patches: 1
- Mailing List (public inbox) Commit SHA: c7753a67a6e1bcb35152ed4024885a47bbbc2428

Applied to:
- Repository: lcpd-prc-meta-arago
- Base Branch: master-wip
- Commit Author: Ryan Eatmon <reatmon@ti.com>
- Commit Subject: ti-test: Make opencl-cts dependent on DISTRO_FEATURES
- Commit SHA: d3532063218f5c47b5e912554a0b236eb25e61f4

Patches
----------------------------------------
All patches applied



=========================================================
  check-yocto-repo: PASS
=========================================================
master
=====================
PASS

On 9/25/25 2:30 PM, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@konsulko.com>
> 
> Use the correct variable, instead of hard-coding /lib/firmware, when
> removing firmware images that overlap with the ones from meta-ti-bsp.
> This way it will work properly even when usrmerge is enabled.
> 
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---
> v2 - separate patches for master and scarthgap
> 
>   .../recipes-kernel/linux-firmware/linux-firmware-arago.inc | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware-arago.inc b/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware-arago.inc
> index 43c54575..30bf399d 100644
> --- a/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware-arago.inc
> +++ b/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware-arago.inc
> @@ -1,6 +1,7 @@
> -PR:append = ".arago2"
> +PR:append = ".arago3"
>   
> +# meta-ti-bsp packages newer versions on these
>   do_install:append() {
> -	rm -rf  ${D}/lib/firmware/ti-connectivity/
> -	rm -rf  ${D}/lib/firmware/cadence/
> +	rm -rf  ${D}${nonarch_base_libdir}/firmware//ti-connectivity/
> +	rm -rf  ${D}${nonarch_base_libdir}/firmware//cadence/

"//" double slash, probably doesn't hurt but does look odd..

Andrew

>   }

On Thu, Sep 25, 2025 at 02:38:29PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> On 9/25/25 2:30 PM, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >Use the correct variable, instead of hard-coding /lib/firmware, when
> >removing firmware images that overlap with the ones from meta-ti-bsp.
> >This way it will work properly even when usrmerge is enabled.
> >
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> >v2 - separate patches for master and scarthgap
> >
> >  .../recipes-kernel/linux-firmware/linux-firmware-arago.inc | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> >
> >diff --git a/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware-arago.inc b/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware-arago.inc
> >index 43c54575..30bf399d 100644
> >--- a/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware-arago.inc
> >+++ b/meta-arago-distro/recipes-kernel/linux-firmware/linux-firmware-arago.inc
> >@@ -1,6 +1,7 @@
> >-PR:append = ".arago2"
> >+PR:append = ".arago3"
> >+# meta-ti-bsp packages newer versions on these
> >  do_install:append() {
> >-	rm -rf  ${D}/lib/firmware/ti-connectivity/
> >-	rm -rf  ${D}/lib/firmware/cadence/
> >+	rm -rf  ${D}${nonarch_base_libdir}/firmware//ti-connectivity/
> >+	rm -rf  ${D}${nonarch_base_libdir}/firmware//cadence/
> 
> "//" double slash, probably doesn't hurt but does look odd..

Oops, v3 is coming.