From 02a1e01c00f1fca678c4596cd80ec747ffc1dd6b Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 27 Jan 2015 07:33:25 -0600 Subject: 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 Signed-off-by: Richard Purdie --- .../target/arch/common/recipes-kernel/linux/linux-yocto-custom.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/lib') 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 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" -- cgit v1.2.3-54-g00ecf