linux-fslc[-imx]: use KBRANCH instead of SRCBRANCH in kernel build

Kernel recipe should define a kernel branch used in recipe via KBRANCH
and not a customized variable SRCBRANCH.

KBRANCH variable is used by several OE tools (e.g. devtool) to define
the checkout policy when recipe is modified to a separate user
workspace.

Replace the occurence of SRCBRANCH with KBRANCH in kernel recipes, and
change fetcher URI to use KBRANCH variable for checkout.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>

diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
index ff86ea861e1d3d7637877cb5d7a7ff7b7c6e500d..7506f3ba6cdb5fee1a1d18772a4d7f2e70dd7130 100644 (file)
--- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
@@ -70,7 +70,7 @@ include linux-fslc.inc
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
-SRCBRANCH = "5.4-2.3.x-imx"
+KBRANCH = "5.4-2.3.x-imx"
 SRCREV = "c789925f9aa01b54630ef32fcd0b5f1804f85ff9"
 
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition

diff --git a/recipes-kernel/linux/linux-fslc-lts-4.19.bb b/recipes-kernel/linux/linux-fslc-lts-4.19.bb
index 41b09347ab3b4d5bfad400a31194424d98f89858..b38e82164660a107af185a985d1f809836888867 100644 (file)
--- a/recipes-kernel/linux/linux-fslc-lts-4.19.bb
+++ b/recipes-kernel/linux/linux-fslc-lts-4.19.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 PV = "4.19.125+git${SRCPV}"
 
-SRCBRANCH = "4.19.x+fslc"
+KBRANCH = "4.19.x+fslc"
 SRCREV = "d839dc0169b3c568813f2ee2abc30720f5244b89"
 
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"

diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc
index f6d04d59ed8f0c0e9238068735b1df9af0bc5338..566dd19463ed718b952796832ebfde50a6d35917 100644 (file)
--- a/recipes-kernel/linux/linux-fslc.inc
+++ b/recipes-kernel/linux/linux-fslc.inc
@@ -5,6 +5,6 @@ require recipes-kernel/linux/linux-imx.inc
 
 DEPENDS += "lzop-native bc-native"
 
-SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH} \
+SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH} \
            file://defconfig"
 LOCALVERSION = "-fslc"

diff --git a/recipes-kernel/linux/linux-fslc_5.10.bb b/recipes-kernel/linux/linux-fslc_5.10.bb
index 3fbe8b360f6463bd20d9bc5514c0cefc2967a088..8138a53b28cd703e388e244b92f8751e0e085b88 100644 (file)
--- a/recipes-kernel/linux/linux-fslc_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc_5.10.bb
@@ -21,7 +21,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 # should be updated once patchlevel is merged.
 LINUX_VERSION = "5.10.16"
 
-SRCBRANCH = "5.10.x+fslc"
+KBRANCH = "5.10.x+fslc"
 SRCREV = "42271aef2fea42e32d3129b4a3abe31ea52b5f61"
 
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"