kernel u-boot: Fix formulation of LOCALVERSION
PATCH 1/1 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.
--- recipes-bsp/u-boot/u-boot-ti.inc | 2 +- recipes-kernel/linux/setup-defconfig.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/u-boot/u-boot-ti.inc +1 -1
@@ -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"
recipes-kernel/linux/setup-defconfig.inc +1 -1
@@ -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
Signature · 1 line
2.17.1
Quoted 7 lines · Ryan Eatmon via lists.yoctoproject.org
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 <[email protected]>
We will need to apply this to master as well - looks like we carried the bug there as well.
Quoted 42 lines
--- recipes-bsp/u-boot/u-boot-ti.inc | 2 +- recipes-kernel/linux/setup-defconfig.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)recipes-bsp/u-boot/u-boot-ti.inc +1
-1@@ -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"recipes-kernel/linux/setup-defconfig.inc +1
-1@@ -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 fileSignature · 11 lines
2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14891): https://lists.yoctoproject.org/g/meta-ti/message/14891 Mute This Topic: https://lists.yoctoproject.org/mt/92514313/5513541 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
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.
Quoted 60 lines · Nishanth Menon
Quoted 7 lines · Ryan Eatmon via lists.yoctoproject.org
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 <[email protected]>Reported-by Daniel Thompson <[email protected]>Tested-by Nishanth Menon <[email protected]>We will need to apply this to master as well - looks like we carried the bug there as well.
Quoted 42 lines
--- recipes-bsp/u-boot/u-boot-ti.inc | 2 +- recipes-kernel/linux/setup-defconfig.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)recipes-bsp/u-boot/u-boot-ti.inc +1
-1@@ -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"recipes-kernel/linux/setup-defconfig.inc +1
-1@@ -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 fileSignature · 11 lines
2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14891): https://lists.yoctoproject.org/g/meta-ti/message/14891 Mute This Topic: https://lists.yoctoproject.org/mt/92514313/5513541 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS