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 <de...@konsulko.com> Signed-off-by: Nishanth Menon <n...@ti.com> --- I think we had a case of dunfell updated with a partial fix. as discussed in review of the original patch: https://lore.kernel.org/all/20220427144355.gk9...@denix.org/ a) we should have used SRCPV that deals with AUTOREV better b) we should have fixed the kernel rev as well.. which is broke as well (follow on patch) Changes since V1: * Update to fix up the $subject to indicate the branch. (sorry for the noise). V1: https://lore.kernel.org/all/20220428030828.18705-1...@ti.com/ 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 cc775e2e271c..903c61f09004 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" -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14630): https://lists.yoctoproject.org/g/meta-ti/message/14630 Mute This Topic: https://lists.yoctoproject.org/mt/90746304/21656 Group Owner: meta-ti+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-