diff options
author | Andrey Zhizhikin <andrey.z@gmail.com> | 2021-02-15 21:53:18 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-02-15 21:23:14 -0300 |
commit | ea0559e137de4823745baf1ef2bca8af972564aa (patch) | |
tree | 455c040abbba79177ce101ae7c1e3f72b3f32f2a /recipes-kernel | |
parent | 50ac32898688dadca56935fb45ddf53e5c08bd6e (diff) | |
download | meta-freescale-ea0559e137de4823745baf1ef2bca8af972564aa.tar.gz |
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>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_5.4.bb | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-lts-4.19.bb | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc.inc | 2 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc_5.10.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index ff86ea86..7506f3ba 100644 --- 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 | |||
70 | LICENSE = "GPLv2" | 70 | LICENSE = "GPLv2" |
71 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 71 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" |
72 | 72 | ||
73 | SRCBRANCH = "5.4-2.3.x-imx" | 73 | KBRANCH = "5.4-2.3.x-imx" |
74 | SRCREV = "c789925f9aa01b54630ef32fcd0b5f1804f85ff9" | 74 | SRCREV = "c789925f9aa01b54630ef32fcd0b5f1804f85ff9" |
75 | 75 | ||
76 | # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition | 76 | # 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 41b09347..b38e8216 100644 --- 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" | |||
13 | 13 | ||
14 | PV = "4.19.125+git${SRCPV}" | 14 | PV = "4.19.125+git${SRCPV}" |
15 | 15 | ||
16 | SRCBRANCH = "4.19.x+fslc" | 16 | KBRANCH = "4.19.x+fslc" |
17 | SRCREV = "d839dc0169b3c568813f2ee2abc30720f5244b89" | 17 | SRCREV = "d839dc0169b3c568813f2ee2abc30720f5244b89" |
18 | 18 | ||
19 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 19 | 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 f6d04d59..566dd194 100644 --- 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 | |||
5 | 5 | ||
6 | DEPENDS += "lzop-native bc-native" | 6 | DEPENDS += "lzop-native bc-native" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH} \ | 8 | SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH} \ |
9 | file://defconfig" | 9 | file://defconfig" |
10 | LOCALVERSION = "-fslc" | 10 | LOCALVERSION = "-fslc" |
diff --git a/recipes-kernel/linux/linux-fslc_5.10.bb b/recipes-kernel/linux/linux-fslc_5.10.bb index 3fbe8b36..8138a53b 100644 --- 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" | |||
21 | # should be updated once patchlevel is merged. | 21 | # should be updated once patchlevel is merged. |
22 | LINUX_VERSION = "5.10.16" | 22 | LINUX_VERSION = "5.10.16" |
23 | 23 | ||
24 | SRCBRANCH = "5.10.x+fslc" | 24 | KBRANCH = "5.10.x+fslc" |
25 | SRCREV = "42271aef2fea42e32d3129b4a3abe31ea52b5f61" | 25 | SRCREV = "42271aef2fea42e32d3129b4a3abe31ea52b5f61" |
26 | 26 | ||
27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" | 27 | COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" |