From 9e6c7d69d8d5700ff22ca03a3d1d1b04bce88f85 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Wed, 27 Apr 2022 22:14:42 -0500 Subject: u-boot-ti: Use SRCPV instead of SRCREV for U_BOOT_LOCAL_VERSION 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#automatically-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 --- recipes-bsp/u-boot/u-boot-ti.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index cc775e2e..903c61f0 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/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 = "-g${@d.getVar("SRCREV", False).__str__()[:10]}" +UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}" UBOOT_SUFFIX ?= "img" SPL_BINARY ?= "MLO" -- cgit v1.2.3-54-g00ecf