yocto-bsp fix

This patchset contains a fix for Yocto Bug 6518 (yocto-bsp create creates faulty SRC_URI). Please apply to dizzy-next.

Changes since v1:
* the wrong patch was sent for v1 - v2 adds the right one.

The following changes since commit 9fc095a439c36014c73b3a8f240afba09fe0e4d7:

image.bbclass: avoid boot error on read-only systemd image (2015-01-15 16:01:47 +0000)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib.git tzanussi/custom-kbranch-dizzy-v2
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/custom-kbranch-dizzy-v2

Tom Zanussi (1):
yocto-bsp: Add branch to SRC_URI for custom kernels

 .../{{ if kernel_choice == \"custom\": }} linux-yocto-custom.bb"      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

1.9.3

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].

---
 .../{{ if kernel_choice == \"custom\": }} linux-yocto-custom.bb"      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 6d3cc6f..c85e731 100644
@@ -31,9 +31,9 @@ inherit kernel
 require recipes-kernel/linux/linux-yocto.inc
 
 {{ if kernel_choice == "custom" and custom_kernel_remote == "y": }}
-SRC_URI = "{{=custom_kernel_remote_path}};protocol=git;bareclone=1"
+SRC_URI = "{{=custom_kernel_remote_path}};protocol=git;bareclone=1;branch=${KBRANCH}"
 {{ if kernel_choice == "custom" and custom_kernel_remote == "n": }}
-SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1"
+SRC_URI = "git://{{=custom_kernel_local_path}};protocol=file;bareclone=1;branch=${KBRANCH}"
 
 SRC_URI += "file://defconfig"
 

1.9.3

merged into staging.

- armin