diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2015-01-28 09:49:39 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-06 14:55:59 +0000 |
commit | 53b33d85de334a96e4f6f7edc2ad72d103627e3b (patch) | |
tree | 95f03fa673e442ae3783a521e8f271940b719080 /scripts/lib | |
parent | 9fc095a439c36014c73b3a8f240afba09fe0e4d7 (diff) | |
download | poky-53b33d85de334a96e4f6f7edc2ad72d103627e3b.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: 71cf7a7866f192caa97cf90b408ac6b9b6ddddf8)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom.bb | 4 |
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 6d3cc6f743..c85e7315ff 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 | |||
31 | require recipes-kernel/linux/linux-yocto.inc | 31 | require 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": }} |
34 | SRC_URI = "{{=custom_kernel_remote_path}};protocol=git;bareclone=1" | 34 | SRC_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": }} |
36 | SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1" | 36 | SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1;branch=${KBRANCH}" |
37 | 37 | ||
38 | SRC_URI += "file://defconfig" | 38 | SRC_URI += "file://defconfig" |
39 | 39 | ||