From 7f752ce2b0f46708401da130f7e5b4743d005ebf Mon Sep 17 00:00:00 2001 From: Dan Murphy Date: Wed, 24 Mar 2021 03:03:29 +0000 Subject: [PATCH] linux-ti-mainline: Set the branch for the ti-upstream-tools repo ti-upstream-tools[1] repository carries the overlays and defconfig fragments that we don't wish to overload upstream kernel community with. The reason for that being these are constantly on churn as our test coverage increases etc. Currently we reuse the "BRANCH" variable to also matchup with kernel and ti-upstream-tools repositories as well. This can tend to be a little painful if we decide to start testing various kernel configurations - RT etc.. So, lets just split out the TOOLS_BRANCH separated from the branch we use for kernel. Even though the branch remains the exact same at this point. [1] https://git.ti.com/cgit/ti-linux-kernel/ti-upstream-tools/ Signed-off-by: Dan Murphy Signed-off-by: Nishanth Menon --- recipes-kernel/linux/linux-ti-mainline_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-ti-mainline_git.bb b/recipes-kernel/linux/linux-ti-mainline_git.bb index 41e852ba..19c091e8 100644 --- a/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -16,6 +16,7 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/git" BRANCH = "master" +TOOLS_BRANCH = "master" # 5.11 Mainline version SRCREV = "f40ddce88593482919761f74910f42f4b84c004b" @@ -29,7 +30,7 @@ KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.g KERNEL_GIT_PROTOCOL = "git" SRC_URI += " \ ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux \ - git://git.ti.com/ti-linux-kernel/ti-upstream-tools.git;protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \ + git://git.ti.com/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=ti-upstream-tools \ file://defconfig \ "