| Message ID | 20250714162953.22052-1-reatmon@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/scarthgap,v2] linux-ti-staging-rt_6.12: Need finer control for BRANCH | expand |
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb index 8f638df2..8da70a02 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb @@ -6,6 +6,9 @@ KERNEL_LOCALVERSION:append = "-rt" # This will have priority over generic non-rt path FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:" +BRANCH_ARM64 = "ti-linux-6.12.y" +BRANCH = "${BRANCH_ARM64}" + BRANCH_ARM32 = "ti-rt-linux-6.12.y-arm32" SRCREV_ARM32 = "1fcbb534d8fab782f701fc197a4345db693b5fc9" PV_ARM32 = "6.12.35+git"
The CICD flow needs to control the value for BRANCH in order to have the recipe updated with the next SRCREV, but point to the CICD/next branch for initial build/test. With this split in linux-ti-staging-rt we cannot just have an override for BRANCH in the local.conf because it trumps the new BRANCH_ARM32 system. This patch creates an additional "default" variable BRANCH_ARM64 (or not arm32), which can be controlled separately by the CICD flow. Then BRANCH simply is picking between the two and so can be controlled by overrides in the recipe. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- v2: Added _6.12 to subject/commit message. meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb | 3 +++ 1 file changed, 3 insertions(+)