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 6B164C43219 for ; Mon, 9 May 2022 17:59:53 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.590.1652119191595051510 for ; Mon, 09 May 2022 10:59:52 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (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 5678F40BC4 for ; Mon, 9 May 2022 17:59:50 +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 b4sZXE6UNM8A for ; Mon, 9 May 2022 17:59:50 +0000 (UTC) Received: from mail.denix.org (pool-100-15-86-127.washdc.fios.verizon.net [100.15.86.127]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 3FE5540C2C for ; Mon, 9 May 2022 17:59:50 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id D3F82174921 for ; Mon, 9 May 2022 13:59:47 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 01/10] u-boot-ti: Use SRCPV instead of SRCREV for U_BOOT_LOCAL_VERSION Date: Mon, 9 May 2022 17:59:38 +0000 Message-Id: <20220509175947.1994132-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509175947.1994132-1-denis@denix.org> References: <20220509175947.1994132-1-denis@denix.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 ; Mon, 09 May 2022 17:59:53 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14721 From: Nishanth Menon SRCREV works with fixed commits, but when we use AUTOREV for a downstream distro bbappend, we will end up getting a bad local revision. Lets use SRCPV instead, which bitbake already deals with sensibly. [1] https://www.yoctoproject.org/docs/2.5.1/dev-manual/dev-manual.html#au= tomatically-incrementing-a-binary-package-revision-number Fixes: 39fa0c1d3d02 ("u-boot-ti: Use SRCREV to get short commit ID") Suggested-by: Denys Dmytriyenko Signed-off-by: Nishanth Menon Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/r= ecipes-bsp/u-boot/u-boot-ti.inc index 5ddcaff7..dddf6284 100644 --- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc +++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc @@ -1,6 +1,6 @@ # UBOOT_LOCALVERSION can be set to add a tag to the end of the # U-boot version string. such as the commit id -UBOOT_LOCALVERSION =3D "-g${@d.getVar("SRCREV", False).__str__()[:10]}" +UBOOT_LOCALVERSION =3D "-g${@d.getVar('SRCPV', True).split('+')[1]}" =20 UBOOT_SUFFIX ?=3D "img" SPL_BINARY ?=3D "MLO" --=20 2.25.1