summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2015-01-27 07:33:25 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-07 13:34:00 +0000
commit02a1e01c00f1fca678c4596cd80ec747ffc1dd6b (patch)
treea028548ed1113a1d6f18dfdfcd52f89f694b7ee4 /scripts
parentbf6f35b214a2d07181ab6736b97b5200897f7be8 (diff)
downloadpoky-02a1e01c00f1fca678c4596cd80ec747ffc1dd6b.tar.gz
yocto-bsp: Add branch to SRC_URI for custom kernels
Without 'branch' in the SRC_URI, a SRCREV specified for a non-master KBRANCH will result in a fetch failure since the branch tested by the fetcher will default to master, which doesn't contain the SRCREV. This fixes the problem by adding branch=KBRANCH to the SRC_URI. Fixes [Yocto #6518]. (From meta-yocto rev: 29a36d4c1146f38b4d204b5b4b89bd002074d47d) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
index 69f598e144..80a52e7cae 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb
@@ -32,9 +32,9 @@ inherit kernel
32require recipes-kernel/linux/linux-yocto.inc 32require recipes-kernel/linux/linux-yocto.inc
33 33
34{{ if kernel_choice == "custom" and custom_kernel_remote == "y": }} 34{{ if kernel_choice == "custom" and custom_kernel_remote == "y": }}
35SRC_URI = "{{=custom_kernel_remote_path}};protocol=git;bareclone=1" 35SRC_URI = "{{=custom_kernel_remote_path}};protocol=git;bareclone=1;branch=${KBRANCH}"
36{{ if kernel_choice == "custom" and custom_kernel_remote == "n": }} 36{{ if kernel_choice == "custom" and custom_kernel_remote == "n": }}
37SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1" 37SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1;branch=${KBRANCH}"
38 38
39SRC_URI += "file://defconfig" 39SRC_URI += "file://defconfig"
40 40