| Message ID | 20241031204955.23594-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/scarthgap] ti-bsp: Tighten up versions for PREFERRED_VERSION | expand |
On Thu, Oct 31, 2024 at 03:49:55PM -0500, Ryan Eatmon via lists.yoctoproject.org wrote: > PREFERRED_VERSION matches against the PV in the recipe, not against the > file name. With the upcoming 6.12, the 6.1 kernel version string was a > little too loose. The "6.1%" could glob onto the 6.12 recipe. Take > this time to also clean up a couple of the other versions and narrow > them down. While this is Ok for stable versions in general, which have 6.1.y versioning, the first release in the series has implied ".0" and when Linus released it, it was versioned as 6.1 (not 6.1.0) until Greg made the first stable release as 6.1.1. Just something to keep in mind... I see you haven't changed 6.12% matching, so it should be fine even for the first release, when it's out. > Signed-off-by: Ryan Eatmon <reatmon@ti.com> > --- > meta-ti-bsp/conf/machine/include/ti-bsp.inc | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc > index 2eb3bd19..d27bbe3c 100644 > --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc > +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc > @@ -53,7 +53,7 @@ MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu" > # TI staging kernel 6.6, u-boot 2024.04 > # ========== > BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging" > -BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%" > +BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6.%" > BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging" > BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%" > > @@ -68,9 +68,9 @@ BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" > # TI staging kernel 6.1, u-boot 2023.04 > # ========== > BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging" > -BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1%" > +BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1.%" > BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging" > -BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023%" > +BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023.04%" > > BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km" > BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%" > -- > 2.17.1
diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 2eb3bd19..d27bbe3c 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -53,7 +53,7 @@ MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu" # TI staging kernel 6.6, u-boot 2024.04 # ========== BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging" -BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%" +BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6.%" BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging" BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%" @@ -68,9 +68,9 @@ BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" # TI staging kernel 6.1, u-boot 2023.04 # ========== BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging" -BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1%" +BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1.%" BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging" -BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023%" +BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023.04%" BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%"
PREFERRED_VERSION matches against the PV in the recipe, not against the file name. With the upcoming 6.12, the 6.1 kernel version string was a little too loose. The "6.1%" could glob onto the 6.12 recipe. Take this time to also clean up a couple of the other versions and narrow them down. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)