diff options
| author | Ryan Eatmon <reatmon@ti.com> | 2024-02-28 13:49:20 -0600 |
|---|---|---|
| committer | Ryan Eatmon <reatmon@ti.com> | 2024-02-28 16:15:01 -0600 |
| commit | 339ae4c94429f520414f7250ed4fb11d504f635c (patch) | |
| tree | 684e3fa0633b844e01005d212dc41692c1d54342 | |
| parent | 79e5bcecbc596a78f6dd08d96c10566a2eaf40ce (diff) | |
| download | meta-ti-339ae4c94429f520414f7250ed4fb11d504f635c.tar.gz | |
u-boot-ti: Change from UBOOT_LOCALVERSION and SRCPV
Stop using UBOOT_LOCALVERSION, and copy what is done in the kernel recipe. This
allows us to set the correct SHA into the version string even if AUTOREV is used
since SRCPV is no longer set in oe-core.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
| -rw-r--r-- | meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 9 |
1 files changed, 6 insertions, 3 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 855307d9..2c0d4fc4 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,9 @@ | |||
| 1 | # UBOOT_LOCALVERSION can be set to add a tag to the end of the | 1 | do_compile:prepend () { |
| 2 | # U-boot version string. such as the commit id | 2 | scm_version=$(printf '%s%s' -ti-g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12)) |
| 3 | UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}" | 3 | |
| 4 | echo ${scm_version} > ${B}/.scmversion | ||
| 5 | echo ${scm_version} > ${S}/.scmversion | ||
| 6 | } | ||
| 4 | 7 | ||
| 5 | UBOOT_SUFFIX ?= "img" | 8 | UBOOT_SUFFIX ?= "img" |
| 6 | SPL_BINARY ?= "MLO" | 9 | SPL_BINARY ?= "MLO" |