From patchwork Thu Sep 25 19:30:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 71043 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8932DCAC5BA for ; Thu, 25 Sep 2025 19:30:35 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.187.1758828627124149391 for ; Thu, 25 Sep 2025 12:30:27 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 78C5540CAA; Thu, 25 Sep 2025 19:30:26 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WfRTSRR1gqQC; Thu, 25 Sep 2025 19:30:26 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 626F540A30; Thu, 25 Sep 2025 19:30:25 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 1EA70163B05; Thu, 25 Sep 2025 15:30:25 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [scarthgap][PATCH v2] linux-firmware-arago: correct removal of overlapping FW Date: Thu, 25 Sep 2025 15:30:24 -0400 Message-Id: <20250925193024.2938544-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 25 Sep 2025 19:30:35 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/16638 From: Denys Dmytriyenko 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 --- 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 cb9573a1..76ca95bd 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,4 +1,4 @@ -PR:append = ".arago1" +PR:append = ".arago2" PACKAGES =+ "${PN}-ibt-18" @@ -8,7 +8,8 @@ FILES:${PN}-ibt-18 = "${nonarch_base_libdir}/firmware/intel/ibt-18-*.sfi ${nonar RDEPENDS:${PN}-ibt-18 += "${PN}-ibt-license" +# 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/ }