summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Eatmon <reatmon@ti.com>2025-07-14 10:56:46 -0500
committerRyan Eatmon <reatmon@ti.com>2025-07-14 14:40:48 -0500
commitfa80d3c09558732cc2f194a2a7418a27a0a1fd6d (patch)
treeb2006b539ec96f588d07f05b0024a0a211f1bf5c
parentc1b69c49af59377ab078b6e2c840d8936abca789 (diff)
downloadmeta-ti-fa80d3c09558732cc2f194a2a7418a27a0a1fd6d.tar.gz
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 <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb3
1 files changed, 3 insertions, 0 deletions
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"
6# This will have priority over generic non-rt path 6# This will have priority over generic non-rt path
7FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:" 7FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
8 8
9BRANCH_ARM64 = "ti-linux-6.12.y"
10BRANCH = "${BRANCH_ARM64}"
11
9BRANCH_ARM32 = "ti-rt-linux-6.12.y-arm32" 12BRANCH_ARM32 = "ti-rt-linux-6.12.y-arm32"
10SRCREV_ARM32 = "f0e4f5ca0905956c70779b31663f594c08c6a3bc" 13SRCREV_ARM32 = "f0e4f5ca0905956c70779b31663f594c08c6a3bc"
11PV_ARM32 = "6.12.35+git" 14PV_ARM32 = "6.12.35+git"