Turns out this fix may not work either. My tests builds are failing
related to this string. Expect a v2 once I figure it out.
On 7/20/2022 16:07, Nishanth Menon wrote:
On 16:01-20220720, Ryan Eatmon via lists.yoctoproject.org wrote:
devtool does not work with the current formulation of
the LOCALVERSION variables. We need to use SRCPV to
avoid AUTOREV on bleeding builds, but there will be no
+ in the string, so we cannot split on that. Just
use SRCPV directly.
Signed-off-by: Ryan Eatmon <reat...@ti.com>
Reported-by: Daniel Thompson <daniel.thomp...@linaro.org>
Tested-by: Nishanth Menon <n...@ti.com>
We will need to apply this to master as well - looks like we carried the
bug there as well.
---
recipes-bsp/u-boot/u-boot-ti.inc | 2 +-
recipes-kernel/linux/setup-defconfig.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc
index e7c93335..c2da2281 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('SRCPV', True).split('+')[1]}"
+UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True)[:10]}"
UBOOT_SUFFIX ?= "img"
SPL_BINARY ?= "MLO"
diff --git a/recipes-kernel/linux/setup-defconfig.inc
b/recipes-kernel/linux/setup-defconfig.inc
index 1e97acc0..08e9b638 100644
--- a/recipes-kernel/linux/setup-defconfig.inc
+++ b/recipes-kernel/linux/setup-defconfig.inc
@@ -1,6 +1,6 @@
# KERNEL_LOCALVERSION can be set to add a tag to the end of the
# kernel version string. such as the commit id
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
+KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True)[:10]}"
# Check the defconfig file and see if it points to an in kernel
# defconfig that should be used, or if it is a complete config file
--
2.17.1
--
Ryan Eatmon reat...@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14896):
https://lists.yoctoproject.org/g/meta-ti/message/14896
Mute This Topic: https://lists.yoctoproject.org/mt/92514313/21656
Group Owner: meta-ti+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
