From mboxrd@z Thu Jan 1 00:00:00 1970 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 DE1D6C369A2 for ; Tue, 8 Apr 2025 15:01:00 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.78009.1744124449797598410 for ; Tue, 08 Apr 2025 08:00:50 -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 B79C440C86; Tue, 8 Apr 2025 15:00:48 +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 cAMJkRzVnc5v; Tue, 8 Apr 2025 15:00:48 +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 992E340C1E; Tue, 8 Apr 2025 15:00:46 +0000 (UTC) Received: by mail.denix.org (Postfix, from userid 1000) id 09A2E165911; Tue, 8 Apr 2025 11:00:46 -0400 (EDT) Date: Tue, 8 Apr 2025 11:00:46 -0400 From: Denys Dmytriyenko To: Ryan Eatmon Cc: meta-ti@lists.yoctoproject.org, Denys Dmytriyenko Subject: Re: [meta-ti] [master][PATCH] optee-client: remove patch that got accepted upstream Message-ID: <20250408150045.GF13634@denix.org> References: <20250408030807.1978102-1-denis@denix.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) 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 ; Tue, 08 Apr 2025 15:01:00 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18451 On Tue, Apr 08, 2025 at 08:41:20AM -0500, Ryan Eatmon wrote: > > I was unsure about doing this... > > meta-arm added a second optee recipe version. So both exist: > optee-client_4.3.0.bb > optee-client_4.4.0.bb > > So "theoretically" the build should prefer the newer version, right? No, that's not how it works. Our bbappend in version-agnostic and hence gets applied to both base recipes. And then bbappend bumps the PV and they are now matching and neither is newer than the other. > But for some reason, our builds keep loading the 4.3.0 recipe and > then our bbappend bumps the version to 4.4.0. The 4.3.0 recipe has > this offending patch, but the 4.4.0 version does not. > > I've been trying to figure out why our builds keep locking into > 4.3.0 when the 4.4.0 is sitting right there... It is a downside of version-agnostic bbappends with PV changes - we've been in this situation before. And we used some version-specific tricks to make it work. Another solution is to make bbappend match a specific version, e.g. rename it to optee-client_4.4%.bbappend for a while, until 4.5 is out... > I agree that this patch is a good work around, but I'm not 100% sure > it's the final best fix. This way is more generic - below :remove would be no-op if such patch is not in the SRC_URI. > On 4/7/2025 10:08 PM, Denys Dmytriyenko wrote: > >From: Denys Dmytriyenko > > > >meta-arm adds a patch that was sent and accepted upstream, remove > >it since mta-ti pulls a more recent verstion. > > > >Signed-off-by: Denys Dmytriyenko > >--- > > .../recipes-security/optee/optee-client-ti-version.inc | 4 ++++ > > 1 file changed, 4 insertions(+) > > > >diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc > >index 2c8977dd..a628e446 100644 > >--- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc > >+++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc > >@@ -1,2 +1,6 @@ > > PV = "4.4.0+git" > > SRCREV = "d221676a58b305bddbf97db00395205b3038de8e" > >+ > >+SRC_URI:remove = " \ > >+ file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \ > >+"