From 1e23cfaf6ee1f22b88455a1f83c299cde50adc37 Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Wed, 20 Jul 2022 15:58:28 -0500 Subject: [PATCH] kernel u-boot: Fix formulation of LOCALVERSION 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 --- 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..1f8fb6de 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).replace('AUTOINC+','')[: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..df7d9ac8 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).replace('AUTOINC+','')[: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