summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2015-01-28 15:48:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-06 14:56:08 (GMT)
commit367b862d596718a7edc3e99eb57a5be82775705d (patch)
treeac2e6f3bdc1111a5e3a25abf77aa0c2af9ea4895
parentc4e9d9d9ae9b118ca7789be518197da21b74193e (diff)
downloadpoky-367b862d596718a7edc3e99eb57a5be82775705d.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: 8aeb8715690ea5aa4a36fbe6403d46f53e0f99a5) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb
index 6d3cc6f..c85e731 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb
@@ -31,9 +31,9 @@ inherit kernel
31require recipes-kernel/linux/linux-yocto.inc 31require recipes-kernel/linux/linux-yocto.inc
32 32
33{{ if kernel_choice == "custom" and custom_kernel_remote == "y": }} 33{{ if kernel_choice == "custom" and custom_kernel_remote == "y": }}
34SRC_URI = "{{=custom_kernel_remote_path}};protocol=git;bareclone=1" 34SRC_URI = "{{=custom_kernel_remote_path}};protocol=git;bareclone=1;branch=${KBRANCH}"
35{{ if kernel_choice == "custom" and custom_kernel_remote == "n": }} 35{{ if kernel_choice == "custom" and custom_kernel_remote == "n": }}
36SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1" 36SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1;branch=${KBRANCH}"
37 37
38SRC_URI += "file://defconfig" 38SRC_URI += "file://defconfig"
39 39