From fa80d3c09558732cc2f194a2a7418a27a0a1fd6d Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Mon, 14 Jul 2025 10:56:46 -0500 Subject: linux-ti-staging-rt_6.12: Need finer control for BRANCH 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 --- meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb | 3 +++ 1 file changed, 3 insertions(+) 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 513b9c0f..974bf1d7 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 = "f0e4f5ca0905956c70779b31663f594c08c6a3bc" PV_ARM32 = "6.12.35+git" -- cgit v1.2.3-54-g00ecf