diff options
| author | Nishanth Menon <nm@ti.com> | 2022-05-09 17:59:38 +0000 |
|---|---|---|
| committer | Ryan Eatmon <reatmon@ti.com> | 2022-05-10 09:56:19 -0500 |
| commit | e3505e2cd02504b3d5c4e9468f4545f7a63f97db (patch) | |
| tree | 83d2c9e7b04b9765472ee6abddba76106b793728 /meta-ti-bsp | |
| parent | aedd163c79fe4f11b9bc28924fc01dde04123e56 (diff) | |
| download | meta-ti-e3505e2cd02504b3d5c4e9468f4545f7a63f97db.tar.gz | |
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 <denys@konsulko.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp')
| -rw-r--r-- | meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-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 @@ | |||
| 1 | # UBOOT_LOCALVERSION can be set to add a tag to the end of the | 1 | # UBOOT_LOCALVERSION can be set to add a tag to the end of the |
| 2 | # U-boot version string. such as the commit id | 2 | # U-boot version string. such as the commit id |
| 3 | UBOOT_LOCALVERSION = "-g${@d.getVar("SRCREV", False).__str__()[:10]}" | 3 | UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}" |
| 4 | 4 | ||
| 5 | UBOOT_SUFFIX ?= "img" | 5 | UBOOT_SUFFIX ?= "img" |
| 6 | SPL_BINARY ?= "MLO" | 6 | SPL_BINARY ?= "MLO" |