| Message ID | 20220722020328.7150-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,dunfell,v2] kernel u-boot: Fix formulation of LOCALVERSION | expand |
On Thu, Jul 21, 2022 at 09:03:28PM -0500, 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. I guess the description is a bit off? > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > v2: More testing showed the first pass caused some problems. > > 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 > -- > 2.17.1 >
On 7/22/2022 13:53, Denys Dmytriyenko wrote: > On Thu, Jul 21, 2022 at 09:03:28PM -0500, 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. > > I guess the description is a bit off? The description should still be valid because the code that is being replaced is doing a blind split and expecting that to work. The new code works if the + is there or not. I could rework the description if needed... > >> Signed-off-by: Ryan Eatmon <reatmon@ti.com> >> --- >> v2: More testing showed the first pass caused some problems. >> >> 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 >> -- >> 2.17.1 >>
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
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 <reatmon@ti.com> --- v2: More testing showed the first pass caused some problems. recipes-bsp/u-boot/u-boot-ti.inc | 2 +- recipes-kernel/linux/setup-defconfig.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)